Show topmost layers first and keep stacking independent of selection
This commit is contained in:
parent
310caa15d3
commit
e38e40530d
|
|
@ -938,8 +938,8 @@ impl Editor {
|
|||
self.manage_layers();
|
||||
}
|
||||
let mut reorder = None;
|
||||
for i in 0..self.layout.layers().len() {
|
||||
let y = 28.0 + i as f32 * 44.0;
|
||||
for (row_index, i) in (0..self.layout.layers().len()).rev().enumerate() {
|
||||
let y = 28.0 + row_index as f32 * 44.0;
|
||||
let color = if self.layout.selection_mask()[i] {
|
||||
palette.amber
|
||||
} else {
|
||||
|
|
@ -999,7 +999,8 @@ impl Editor {
|
|||
&& let Some(from) = (0..self.layout.layers().len())
|
||||
.find(|&j| self.layout.layer_info(j).id == payload.0)
|
||||
{
|
||||
let slot = i + usize::from(after);
|
||||
// The UI is top-to-bottom; document indices are back-to-front.
|
||||
let slot = i + usize::from(!after);
|
||||
let to = slot - usize::from(from < slot);
|
||||
reorder = Some((payload.0, to));
|
||||
}
|
||||
|
|
@ -5395,7 +5396,11 @@ mod tests {
|
|||
let mut app = Editor::default();
|
||||
let ctx = egui::Context::default();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let p = Pos2::new(1180.0, 135.0);
|
||||
let p = ctx
|
||||
.read_response(egui::Id::new(("layer", 1_usize)))
|
||||
.unwrap()
|
||||
.rect
|
||||
.center();
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
|
|
@ -5669,7 +5674,7 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn selected_layer_is_painted_last_and_keeps_overlap_clicks() {
|
||||
fn list_top_matches_paint_order_and_selection_does_not_raise_layers() {
|
||||
let mut app = Editor::default();
|
||||
let mut g = app.layout.layers()[0];
|
||||
g.x += 100.0;
|
||||
|
|
@ -5679,7 +5684,16 @@ mod tests {
|
|||
let ctx = egui::Context::default();
|
||||
let output = frame(&mut app, &ctx, vec![]);
|
||||
let rects = layer_rects(&output);
|
||||
assert!(rects[1].left() < rects[0].left());
|
||||
assert!(rects[1].left() > rects[0].left());
|
||||
let top_row = ctx
|
||||
.read_response(egui::Id::new(("layer", 2_usize)))
|
||||
.unwrap()
|
||||
.rect;
|
||||
let bottom_row = ctx
|
||||
.read_response(egui::Id::new(("layer", 1_usize)))
|
||||
.unwrap()
|
||||
.rect;
|
||||
assert!(top_row.top() < bottom_row.top());
|
||||
let overlap = rects[0].intersect(rects[1]).center();
|
||||
frame(
|
||||
&mut app,
|
||||
|
|
@ -5687,7 +5701,7 @@ mod tests {
|
|||
vec![egui::Event::PointerMoved(overlap), mouse(overlap, true)],
|
||||
);
|
||||
frame(&mut app, &ctx, vec![mouse(overlap, false)]);
|
||||
assert_eq!(app.layout.selected(), Some(0));
|
||||
assert_eq!(app.layout.selected(), Some(1));
|
||||
assert_eq!(*app.layout.layers(), before);
|
||||
app.layout.select(Some(1));
|
||||
let output = frame(&mut app, &ctx, vec![]);
|
||||
|
|
@ -5706,7 +5720,12 @@ mod tests {
|
|||
assert_eq!(app.layout.selected_indices(), vec![0, 1]);
|
||||
click_shift(&mut app, &ctx, rects[1].center());
|
||||
assert_eq!(app.layout.selected(), Some(0));
|
||||
click_shift(&mut app, &ctx, Pos2::new(1180.0, 180.0));
|
||||
let second = ctx
|
||||
.read_response(egui::Id::new(("layer", 2_usize)))
|
||||
.unwrap()
|
||||
.rect
|
||||
.center();
|
||||
click_shift(&mut app, &ctx, second);
|
||||
assert_eq!(app.layout.selected_indices(), vec![0, 1]);
|
||||
let row = ctx
|
||||
.read_response(egui::Id::new(("layer", 1_usize)))
|
||||
|
|
|
|||
|
|
@ -177,12 +177,12 @@ impl Editor {
|
|||
egui::ScrollArea::vertical().max_height(400.0).show(ui, |ui| {
|
||||
egui::Grid::new("layer-management").striped(true).show(ui, |ui| {
|
||||
ui.label("Order"); ui.label("Select / ID"); ui.label("Name"); ui.label("Folder (optional)"); ui.label("Visibility"); ui.label("Protection"); ui.end_row();
|
||||
for (i, (id, name, folder)) in self.layer_ui.drafts.iter_mut().enumerate() {
|
||||
for (i, (id, name, folder)) in self.layer_ui.drafts.iter_mut().enumerate().rev() {
|
||||
if self.layer_ui.folder_filter.as_ref().is_some_and(|folder| *folder != self.layout.layer_info(i).folder) { continue; }
|
||||
ui.horizontal(|ui| {
|
||||
let unfiltered = self.layer_ui.folder_filter.is_none();
|
||||
if ui.add_enabled(unfiltered && i > 0, egui::Button::new("↑")).on_hover_text("Move up").on_disabled_hover_text("Show all folders to reorder; the first layer cannot move up.").clicked() { reorder = Some((*id, i - 1)); }
|
||||
if ui.add_enabled(unfiltered && i + 1 < self.layout.layers().len(), egui::Button::new("↓")).on_hover_text("Move down").on_disabled_hover_text("Show all folders to reorder; the last layer cannot move down.").clicked() { reorder = Some((*id, i + 1)); }
|
||||
if ui.add_enabled(unfiltered && i + 1 < self.layout.layers().len(), egui::Button::new("↑")).on_hover_text("Move up / bring forward").on_disabled_hover_text("Show all folders to reorder; the top layer cannot move up.").clicked() { reorder = Some((*id, i + 1)); }
|
||||
if ui.add_enabled(unfiltered && i > 0, egui::Button::new("↓")).on_hover_text("Move down / send backward").on_disabled_hover_text("Show all folders to reorder; the bottom layer cannot move down.").clicked() { reorder = Some((*id, i - 1)); }
|
||||
});
|
||||
let selected = self.layout.selection_mask()[i];
|
||||
if ui.selectable_label(selected, format!("{id:02}")).clicked() { self.layout.toggle(i); sync = true; }
|
||||
|
|
@ -264,6 +264,51 @@ impl Editor {
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn dragging_top_row_below_bottom_row_sends_it_to_the_back() {
|
||||
use super::super::tests::{frame, mouse};
|
||||
let ctx = egui::Context::default();
|
||||
let mut app = Editor::default();
|
||||
app.layout.add_layer().unwrap();
|
||||
app.sync();
|
||||
let before = midra_layout::project::Project::from_layout(&app.layout);
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let start = ctx
|
||||
.read_response(egui::Id::new(("layer", 3_usize)))
|
||||
.unwrap()
|
||||
.rect
|
||||
.center();
|
||||
let end = ctx
|
||||
.read_response(egui::Id::new(("layer", 1_usize)))
|
||||
.unwrap()
|
||||
.rect
|
||||
.center_bottom()
|
||||
- Vec2::new(0.0, 3.0);
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
vec![egui::Event::PointerMoved(start), mouse(start, true)],
|
||||
);
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
vec![egui::Event::PointerMoved(start + Vec2::new(0.0, 12.0))],
|
||||
);
|
||||
frame(&mut app, &ctx, vec![egui::Event::PointerMoved(end)]);
|
||||
frame(&mut app, &ctx, vec![mouse(end, false)]);
|
||||
assert_eq!(
|
||||
(0..3)
|
||||
.map(|i| app.layout.layer_info(i).id)
|
||||
.collect::<Vec<_>>(),
|
||||
[3, 1, 2]
|
||||
);
|
||||
app.layout.undo();
|
||||
assert_eq!(
|
||||
midra_layout::project::Project::from_layout(&app.layout),
|
||||
before
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn manager_reorders_without_applying_pending_names_and_undo_keeps_alignment_identity() {
|
||||
use super::super::tests::click_text;
|
||||
|
|
@ -307,7 +352,9 @@ mod tests {
|
|||
.rect
|
||||
};
|
||||
let start = row(1_usize).center();
|
||||
let end = row(3_usize).center_bottom() - Vec2::new(0.0, 3.0);
|
||||
assert!(row(3_usize).top() < row(2_usize).top());
|
||||
assert!(row(2_usize).top() < row(1_usize).top());
|
||||
let end = row(3_usize).center_top() + Vec2::new(0.0, 3.0);
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
|
|
|
|||
|
|
@ -1034,12 +1034,9 @@ impl Layout {
|
|||
self.remember(before);
|
||||
Ok(())
|
||||
}
|
||||
/// Viewport back-to-front order; selected layers are drawn last.
|
||||
/// Layer identities and export order remain unchanged.
|
||||
/// Document back-to-front order; selection never changes stacking.
|
||||
pub fn viewport_order(&self) -> Vec<usize> {
|
||||
let mut order: Vec<_> = (0..self.layers.len()).collect();
|
||||
order.sort_by_key(|i| self.selected[*i]);
|
||||
order
|
||||
(0..self.layers.len()).collect()
|
||||
}
|
||||
pub fn hit(&self, point: [f64; 2]) -> Option<usize> {
|
||||
self.viewport_order()
|
||||
|
|
|
|||
|
|
@ -217,6 +217,6 @@ fn reordered_stacking_and_hit_testing_follow_document_order() {
|
|||
layout.move_layer(1, 1).unwrap();
|
||||
assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 1);
|
||||
layout.select(Some(0));
|
||||
// Selected layers retain the editor's existing foreground behavior.
|
||||
assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 2);
|
||||
// Selecting the lower layer does not raise it above the saved top layer.
|
||||
assert_eq!(layout.layer_info(layout.hit([200.0, 200.0]).unwrap()).id, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -888,14 +888,14 @@ fn resize_handle_modes_distinguish_horizontal_mirror_from_opposite() {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn selected_layers_are_foreground_for_viewport_and_hit_testing() {
|
||||
fn selection_never_changes_viewport_stacking_or_hit_order() {
|
||||
let mut l = Layout::default();
|
||||
l.apply(0, g()).unwrap();
|
||||
l.apply(1, g()).unwrap();
|
||||
let before = l.layers().clone();
|
||||
for (selection, order, hit) in [
|
||||
([false, false], [0, 1], Some(1)),
|
||||
([true, false], [1, 0], Some(0)),
|
||||
([true, false], [0, 1], Some(1)),
|
||||
([false, true], [0, 1], Some(1)),
|
||||
([true, true], [0, 1], Some(1)),
|
||||
] {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ without a reference image. It is loaded by the regression tests.
|
|||
| `next_layer_id` | Positive integer strictly greater than every layer ID; not rewound by undo |
|
||||
| `output_resolution` | `{ "width": integer, "height": integer }`, screen pixels |
|
||||
| `inputs` | 1–1024 input objects, consecutive IDs starting at 1 |
|
||||
| `layers` | 1–256 layer objects, unique positive stable IDs, in stacking order |
|
||||
| `layers` | 1–256 layer objects, unique positive stable IDs, in back-to-front stacking order (last is topmost) |
|
||||
| `reference` | `null` or an embedded reference-image object |
|
||||
| `editor` | Selection, positioning and viewport preferences |
|
||||
|
||||
|
|
@ -133,12 +133,12 @@ layer); rectangles retain stable IDs and document stacking order. Names/folders
|
|||
are not added to the geometry SVG format.
|
||||
|
||||
Reordering changes only the order of the existing `layers` array, not IDs or
|
||||
per-layer values. Reordering uses the existing array order; SVG remains v1. Moving layer 1 below
|
||||
layer 2 saves IDs in `[2, 1]` order and emits `layer-2` before `layer-1` in SVG.
|
||||
per-layer values. Reordering uses the existing array order; SVG remains v1. Moving layer 1 above
|
||||
layer 2 in the list saves IDs in `[2, 1]` order and emits `layer-2` before `layer-1` in SVG.
|
||||
Loading preserves that order; selected-layer exports still follow document order,
|
||||
not selection order. Source slots, `next_layer_id`, names, folders, crop geometry,
|
||||
visibility/locks and Midra links remain attached to their original layer IDs.
|
||||
The editor's temporary selected-layer foreground drawing does not alter file order.
|
||||
The inspector and layer manager display the reverse of document order: top row is topmost. Selection does not raise a layer; canvas drawing and hit testing follow the saved stack.
|
||||
|
||||
## SVG geometry exchange, version 1
|
||||
|
||||
|
|
@ -156,7 +156,7 @@ and `viewBox="0 0 W H"` equal to the output screen. The root carries
|
|||
```
|
||||
|
||||
- IDs are stable layer names `layer-1`, `layer-2`; rectangle order is document
|
||||
order, independent of viewport selection/foreground drawing.
|
||||
order, independent of viewport selection.
|
||||
- Coordinates are the visible box top-left and size, rounded independently to
|
||||
nearest whole pixels; half values round away from zero. Negative coordinates
|
||||
are retained. Dimensions that would round to zero reject export.
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ clipboard testing against a running draw.io instance remains to be done.
|
|||
## Move and edit layers
|
||||
|
||||
- Click a layer or its list entry to select it alone. **Shift-click** toggles that
|
||||
layer in the selection. Selected layers appear in the foreground. In overlaps, the frontmost selectable
|
||||
layer in the selection. Selection does not change stacking. The top row of the layer list is the frontmost layer. In overlaps, the frontmost selectable
|
||||
layer wins; the list lets you
|
||||
reach the lower layer. Clicking empty canvas clears selection; Shift-clicking
|
||||
empty canvas preserves it.
|
||||
|
|
@ -651,9 +651,9 @@ or drag a layer name in the right-hand list and drop above/below another row.
|
|||
A cyan line marks the drop position; Escape or releasing outside the list cancels.
|
||||
Choose **All folders** to enable the manager’s reorder buttons. Hidden/locked
|
||||
layers can be reordered without changing their flags. Each move is one Undo step;
|
||||
pending names/folders follow their layer. List order is the saved stacking/export
|
||||
order (later rows draw above earlier rows); selected layers still draw in front
|
||||
while editing. Reordering never changes geometry, source assignments or Midra links,
|
||||
pending names/folders follow their layer. The list reads front-to-back (top row on
|
||||
top); saved arrays and SVG read back-to-front. Moving a row up brings it forward;
|
||||
moving down sends it backward. Selection does not change stacking. Reordering never changes geometry, source assignments or Midra links,
|
||||
and never sends to the device.
|
||||
|
||||
Stable IDs survive removal and are independent of Midra layer numbers. Group
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
- Layer lists now show the topmost layer first; drag/drop and arrows match. Selection no longer raises layers temporarily. Saved project/SVG stacking stays compatible.
|
||||
|
||||
- Show current aspect ratios beside dimensions and the ratio lock. Accept manual W:H, W/H or decimal ratios; locked edits keep width/reference and adjust height, unlocked edits wait for the lock. Layer properties remain Apply-based.
|
||||
|
||||
- Add persistent 10 px/100 px grid and Pivot toolbar icons with shortcut tooltips. Grids exclude each other; Pivot combines with either. Matching modifiers temporarily invert toggles; choices last for the session.
|
||||
|
|
|
|||
Loading…
Reference in New Issue