Align a single selected layer to screen by default
This commit is contained in:
parent
052a7cdaa8
commit
8dffb43379
|
|
@ -835,23 +835,25 @@ impl Editor {
|
|||
if self.align_target == AlignTarget::Screen {
|
||||
self.align_target = AlignTarget::Selection;
|
||||
}
|
||||
let single_layer = self.layout.selected_indices().len() == 1;
|
||||
let default_name = if single_layer {
|
||||
"Screen (one selected layer)"
|
||||
} else {
|
||||
"Selected layers"
|
||||
};
|
||||
let target_name = |target| match target {
|
||||
AlignTarget::Layer(i) => format!(
|
||||
"Layer {}: {}",
|
||||
i + 1,
|
||||
label(i).split(" / ").last().unwrap_or(label(i))
|
||||
),
|
||||
_ => "Selected layers".to_owned(),
|
||||
_ => default_name.to_owned(),
|
||||
};
|
||||
egui::ComboBox::from_id_salt("alignment-target")
|
||||
.width(210.0)
|
||||
.selected_text(target_name(self.align_target))
|
||||
.show_ui(ui, |ui| {
|
||||
ui.selectable_value(
|
||||
&mut self.align_target,
|
||||
AlignTarget::Selection,
|
||||
"Selected layers",
|
||||
);
|
||||
ui.selectable_value(&mut self.align_target, AlignTarget::Selection, default_name);
|
||||
for i in 0..self.layout.layers().len() {
|
||||
ui.selectable_value(
|
||||
&mut self.align_target,
|
||||
|
|
@ -889,7 +891,12 @@ impl Editor {
|
|||
);
|
||||
if alignment_icon(ui, rect, title, horizontal, vertical).clicked() {
|
||||
let axes: Vec<_> = [horizontal, vertical].into_iter().flatten().collect();
|
||||
match self.layout.align_axes(&axes, self.align_target) {
|
||||
let target = if self.align_target == AlignTarget::Selection && single_layer {
|
||||
AlignTarget::Screen
|
||||
} else {
|
||||
self.align_target
|
||||
};
|
||||
match self.layout.align_axes(&axes, target) {
|
||||
Ok(()) => {
|
||||
self.sync();
|
||||
ui.close_menu();
|
||||
|
|
@ -2694,6 +2701,55 @@ mod tests {
|
|||
rects[if title == "Align top" { 1 } else { 7 }].center()
|
||||
}
|
||||
#[test]
|
||||
fn single_layer_alignment_grid_uses_current_screen_bounds() {
|
||||
for (index, x, y) in [
|
||||
(0, Some(0.0), Some(0.0)),
|
||||
(1, None, Some(0.0)),
|
||||
(2, Some(1920.0), Some(0.0)),
|
||||
(3, Some(0.0), None),
|
||||
(4, Some(960.0), Some(540.0)),
|
||||
(5, Some(1920.0), None),
|
||||
(6, Some(0.0), Some(1080.0)),
|
||||
(7, None, Some(1080.0)),
|
||||
(8, Some(1920.0), Some(1080.0)),
|
||||
(9, None, Some(540.0)),
|
||||
(10, Some(960.0), None),
|
||||
] {
|
||||
let mut app = Editor::default();
|
||||
app.layout.set_output([2560, 1440]).unwrap();
|
||||
let before = *app.layout.layers();
|
||||
let formats = *app.layout.formats();
|
||||
let ctx = egui::Context::default();
|
||||
let output = open_alignment_test_menu(&mut app, &ctx);
|
||||
assert!(output.shapes.iter().any(|s| matches!(&s.shape, egui::epaint::Shape::Text(t) if t.galley.job.text == "Screen (one selected layer)")));
|
||||
let pos = output
|
||||
.shapes
|
||||
.iter()
|
||||
.filter_map(|s| match &s.shape {
|
||||
egui::epaint::Shape::Rect(r) if r.rect.size() == Vec2::splat(40.0) => {
|
||||
Some(r.rect.center())
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
.nth(index)
|
||||
.unwrap();
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
vec![egui::Event::PointerMoved(pos), mouse(pos, true)],
|
||||
);
|
||||
frame(&mut app, &ctx, vec![mouse(pos, false)]);
|
||||
let g = app.layout.layers()[1];
|
||||
assert_eq!(g.x, x.unwrap_or(before[1].x));
|
||||
assert_eq!(g.y, y.unwrap_or(before[1].y));
|
||||
assert_eq!([g.width, g.height], [before[1].width, before[1].height]);
|
||||
assert_eq!(app.layout.layers()[0], before[0]);
|
||||
assert_eq!(*app.layout.formats(), formats);
|
||||
app.layout.undo();
|
||||
assert_eq!(*app.layout.layers(), before);
|
||||
}
|
||||
}
|
||||
#[test]
|
||||
fn top_and_bottom_buttons_align_rendered_edges_for_every_target() {
|
||||
for target in [
|
||||
AlignTarget::Selection,
|
||||
|
|
|
|||
|
|
@ -137,10 +137,12 @@ clipboard testing against a running draw.io instance remains to be done.
|
|||
## Align selected layers
|
||||
|
||||
Open the **Align selected layers** icon menu beside the view/history toolbar.
|
||||
The **Align to** dropdown defaults to **Selected layers** (their combined bounds).
|
||||
The **Align to** dropdown automatically uses **Screen (one selected layer)**
|
||||
for a single layer and **Selected layers** (their combined bounds) for multiple
|
||||
layers. Screen alignment uses the current output resolution.
|
||||
It also lists **Layer 1: Presenter**, **Layer 2: Slides**, and any future layers.
|
||||
A reference layer stays fixed and does not need to be selected. Screen alignment
|
||||
is not offered in this menu.
|
||||
An explicitly chosen reference layer takes precedence, stays fixed and does not
|
||||
need to be selected. There is no separate Screen option for multi-selection.
|
||||
|
||||
The compact icon grid offers four corners, top/bottom/left/right edges, center
|
||||
on both axes, and separate horizontal/vertical centering. Edge buttons change
|
||||
|
|
|
|||
Loading…
Reference in New Issue