pauljd/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-11-15 21:57:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Control bar: symbol instance controls keep the Transform link's room

Browse Source 
The gap after the symbol instance controls was added whenever 4 pt
remained, without the room the Transform link needs after the group.
When a narrow bar left out the symbol controls, the gap could take the
last points the link needed, and the bar hid the link. The gap is now
added only when the reserve remains after it.
This commit is contained in:
dotCooCoo
2026-11-15 06:51:02 -08:00
parent 3075889f0c
commit 1957fdda0f
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/panels/symbols.rs
+26 -1
View File
@@ -287,7 +287,7 @@ pub(crate) fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui, reserve: f32) {
{
app.status(e);
}
if ui.available_width() >= 4.0 {
if ui.available_width() >= reserve + 4.0 {
ui.add_space(4.0);
}
}
@@ -1789,4 +1789,29 @@ mod tests {
h.get_by_label(" Select All Instances").click();
h.run_steps(2);
}
/// The Control bar's symbol instance controls leave the room `reserve` asks for after them, the
/// gap after the controls included, when the row has no room for any of them.
#[test]
fn control_bar_symbol_controls_leave_the_reserve_when_none_fits() {
let mut app = VectorcraftApp::new(Session::new(), Default::default());
app.run("file.new", json!({"width": 200, "height": 100})).unwrap();
let art = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 20})).unwrap()["id"].clone();
let instance = app.run("symbol.new", json!({"name": "Mark", "ids": [art]})).unwrap()["id"].clone();
app.run("select.set", json!({ "ids": [instance] })).unwrap();
let ctx = egui::Context::default();
let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(600.0, 100.0))), ..Default::default() };
let mut room = None;
let mut out = ctx.run_ui(raw, |ui| {
ui.horizontal(|ui| {
// Two points more than the reserve: too little for Edit Symbol or Replace.
let reserve = ui.available_width() - 2.0;
control_bar(&mut app, ui, reserve);
room = Some((ui.available_width(), reserve));
});
});
out.textures_delta.clear();
let (left, reserve) = room.expect("the row was drawn");
assert!(left >= reserve, "{left} pt left after the symbol controls, {reserve} pt reserved");
}
}