Toolbar: a constraint dragged out of the small box becomes a full button (#5254) (#5456)

* claim: #5254

* Toolbar: a constraint dragged out of the small box becomes a full button (#5254)

The Constrain panel's small box of constraint icons was a fixed list, so
dragging one onto the full-size buttons saved a new order but it was still
drawn in the box. The toolbar settings now remember, per tab, which box
commands were moved out; those are drawn as full buttons, the box closes
up, and dropping one back on a box icon returns it. Reset Toolbar restores
the default box, and settings saved before this load unchanged.
This commit is contained in:
raykholo authored and GitHub committed 2026-10-23 14:28:23 +00:00
1 parent 3093ce1d87
commit 4e7bf2b63a
2 files changed
+97 -11

No files matched your search

+62 -10
View File
@@ -1112,7 +1112,13 @@ pub fn toolbar(app: &mut SolveApp, ui: &mut egui::Ui) {
let mut shown = crate::toolbar_custom::buttons(app, &tab, panel, &cmds, promote);
// Gallery cells are painted together after the large buttons, in reading order.
if tab == "SKETCH" && panel == "CONSTRAIN" {
shown.sort_by_key(|c| crate::workspace::CONSTRAINT_GALLERY.iter().position(|id| *id == c.id).map(|i| i + 1).unwrap_or(0));
shown.sort_by_key(|c| {
if app.toolbar_custom.in_gallery(&tab, panel, c.id) {
crate::workspace::CONSTRAINT_GALLERY.iter().position(|id| *id == c.id).map(|i| i + 1).unwrap_or(0)
} else {
0
}
});
}
(panel, cmds, shown)
})
@@ -1122,7 +1128,7 @@ pub fn toolbar(app: &mut SolveApp, ui: &mut egui::Ui) {
.map(|(panel, _, shown)| {
let mut widths: Vec<_> = shown
.iter()
.filter(|c| !(tab == "SKETCH" && *panel == "CONSTRAIN" && crate::workspace::CONSTRAINT_GALLERY.contains(&c.id)))
.filter(|c| !app.toolbar_custom.in_gallery(&tab, panel, c.id))
.map(|c| {
let family = crate::sketch_families::family(c.id)
.filter(|f| tab == "SKETCH" && *panel == "CREATE" && f.commands.first().copied() == Some(c.id));
@@ -1135,7 +1141,7 @@ pub fn toolbar(app: &mut SolveApp, ui: &mut egui::Ui) {
}
})
.collect();
if tab == "SKETCH" && *panel == "CONSTRAIN" && shown.iter().any(|c| crate::workspace::CONSTRAINT_GALLERY.contains(&c.id)) {
if shown.iter().any(|c| app.toolbar_custom.in_gallery(&tab, panel, c.id)) {
widths.push(ButtonSize { width: gallery_width, min_width: gallery_width });
}
PanelSize { buttons: widths }
@@ -1178,11 +1184,7 @@ pub fn toolbar(app: &mut SolveApp, ui: &mut egui::Ui) {
let popup_id = ui.id().with(("panel_menu", &tab, panel));
// Dropped on the panel's free space (all of a collapsed panel): the button goes to
// its end.
let gallery: Vec<_> = shown
.iter()
.copied()
.filter(|c| tab == "SKETCH" && *panel == "CONSTRAIN" && crate::workspace::CONSTRAINT_GALLERY.contains(&c.id))
.collect();
let gallery: Vec<_> = shown.iter().copied().filter(|c| app.toolbar_custom.in_gallery(&tab, panel, c.id)).collect();
let large: Vec<_> = shown.iter().copied().filter(|c| !gallery.iter().any(|g| g.id == c.id)).collect();
let drawn = if collapsed { 0 } else { plan.shown.min(button_widths.len()) };
// Buttons narrower than the panel's minimum width (a one-button panel) are centred.
@@ -1317,8 +1319,7 @@ pub fn toolbar(app: &mut SolveApp, ui: &mut egui::Ui) {
Stroke::new(1.0, t.toolbar.lerp_to_gamma(t.border, 0.5)),
);
}
for c in &gallery {
let index = crate::workspace::CONSTRAINT_GALLERY.iter().position(|id| *id == c.id).unwrap_or(0);
for (index, c) in gallery.iter().enumerate() {
let columns = if labels { 3 } else { 6 };
let cell = Rect::from_min_size(
pos2(button_x + (index % columns) as f32 * 27.0, top + 6.0 + (index / columns) as f32 * 23.0),
@@ -2933,6 +2934,57 @@ mod ribbon_gallery_tests {
use super::*;
use crate::scenario::{Harness, rect_of};
#[test]
fn dragged_constraint_becomes_full_button_and_reset_restores_gallery() {
let mut h = Harness::new();
h.call("ui.resize", json!({"width":1800,"height":900}));
h.app.run("sketch.create", json!({"plane":"XY"})).unwrap();
h.frames(3);
let id = crate::workspace::CONSTRAINT_GALLERY[0];
let cell_handle = format!("ribbon:constraint:{id}");
let button_handle = format!("toolbar:{id}");
let button = format!("button:{id}");
let cell = rect_of(&cell_handle).unwrap();
let count = || crate::scenario::handles("ribbon:constraint:").len();
let original_count = count();
h.step(&json!({"drag":[{"handle":button_handle},{"handle":"toolbar:sketch.dimension"}]})).unwrap();
h.frames(3);
assert!(rect_of(&cell_handle).is_none());
let full = rect_of(&button).unwrap();
assert!(full.height() > cell.height());
assert!(full.left() < rect_of("button:sketch.dimension").unwrap().left());
assert_eq!(count(), original_count - 1);
let next = format!("ribbon:constraint:{}", crate::workspace::CONSTRAINT_GALLERY[1]);
assert_eq!(rect_of(&next).unwrap().top(), cell.top());
h.step(&json!({"drag":[{"handle":button_handle},{"handle":next}]})).unwrap();
h.frames(3);
assert_eq!(rect_of(&cell_handle), Some(cell));
assert_eq!(count(), original_count);
h.step(&json!({"drag":[{"handle":button_handle},{"handle":"toolbar:sketch.dimension"}]})).unwrap();
h.frames(3);
assert!(rect_of(&cell_handle).is_none());
let saved = crate::toolbar_custom::export(&h.app);
crate::toolbar_custom::reset(&mut h.app, "SKETCH");
crate::toolbar_custom::import(&mut h.app, &saved).unwrap();
h.frames(3);
assert!(rect_of(&cell_handle).is_none());
assert_eq!(rect_of(&button).unwrap().height(), full.height());
// Settings saved before the gallery could change load with the default gallery.
let mut older = h.app.toolbar_custom.prefs();
older.as_object_mut().unwrap().remove("gallery_buttons");
let mut loaded = crate::toolbar_custom::ToolbarCustom::default();
loaded.load(&older);
assert_eq!(loaded.panels, h.app.toolbar_custom.panels);
assert!(loaded.in_gallery("SKETCH", "CONSTRAIN", id));
crate::toolbar_custom::reset(&mut h.app, "MODEL");
h.frames(2);
assert!(rect_of(&cell_handle).is_none());
crate::toolbar_custom::reset(&mut h.app, "SKETCH");
h.frames(3);
assert_eq!(rect_of(&cell_handle), Some(cell));
assert_eq!(count(), original_count);
}
#[test]
fn constraint_gallery_preserves_button_handles_order_and_pin_actions() {
let mut h = Harness::new();
+35 -1
View File
@@ -24,13 +24,23 @@ pub struct ToolbarCustom {
/// `"<workspace>/<tab>/<panel>"` → the panel's buttons, in order (only panels the user
/// changed).
pub panels: BTreeMap<String, Vec<String>>,
/// `"<workspace>/<tab>"` → gallery commands moved to full-size buttons.
pub gallery_buttons: BTreeMap<String, Vec<String>>,
/// The Customize Toolbar window is open (not kept).
pub customizing: bool,
}
impl ToolbarCustom {
/// Whether a command still uses a compact gallery cell in this panel.
pub fn in_gallery(&self, tab: &str, panel: &str, id: &str) -> bool {
tab == "SKETCH"
&& panel == "CONSTRAIN"
&& crate::workspace::CONSTRAINT_GALLERY.contains(&id)
&& !self.gallery_buttons.get(&format!("{WORKSPACE}/{tab}")).is_some_and(|ids| ids.iter().any(|c| c == id))
}
pub fn prefs(&self) -> Value {
json!({"version": 2, "panels": self.panels})
json!({"version": 2, "panels": self.panels, "gallery_buttons": self.gallery_buttons})
}
pub fn load(&mut self, v: &Value) {
let current = v.get("version").and_then(Value::as_u64) == Some(2);
@@ -47,6 +57,19 @@ impl ToolbarCustom {
.collect()
})
.unwrap_or_default();
self.gallery_buttons = v
.get("gallery_buttons")
.and_then(Value::as_object)
.map(|o| {
o.iter()
.take(500)
.filter_map(|(k, v)| {
let ids = v.as_array()?.iter().take(100).filter_map(|x| x.as_str().map(str::to_string)).collect();
Some((k.clone(), ids))
})
.collect()
})
.unwrap_or_default();
if !current {
self.migrate();
}
@@ -192,6 +215,16 @@ pub fn remove(app: &mut SolveApp, tab: &str, id: &str) {
/// Move a button before another one (`before`: None puts it at the end of `panel`).
pub fn reorder(app: &mut SolveApp, tab: &str, id: &str, panel: &str, before: Option<&str>) {
// A gallery command dropped on a gallery cell goes (back) into the gallery; dropped anywhere
// else it becomes a full-size button.
if tab == "SKETCH" && crate::workspace::CONSTRAINT_GALLERY.contains(&id) {
let into_gallery = before.is_some_and(|b| app.toolbar_custom.in_gallery(tab, panel, b));
let ids = app.toolbar_custom.gallery_buttons.entry(format!("{WORKSPACE}/{tab}")).or_default();
ids.retain(|c| c != id);
if !into_gallery {
ids.push(id.to_string());
}
}
if let Some(from) = pinned_on(app, tab, id) {
let mut ids = own(app, tab, from);
ids.retain(|x| x != id);
@@ -217,6 +250,7 @@ pub fn toggle(app: &mut SolveApp, tab: &str, id: &str) {
pub fn reset(app: &mut SolveApp, tab: &str) {
let prefix = format!("{WORKSPACE}/{tab}/");
app.toolbar_custom.panels.retain(|k, _| !k.starts_with(&prefix));
app.toolbar_custom.gallery_buttons.remove(&format!("{WORKSPACE}/{tab}"));
}
/// The menu of a command (toolbar button, drop-down row, S box row).