Replace Import label with a downward-arrow toolbar icon
This commit is contained in:
parent
c8389c9ef7
commit
975f5a382a
|
|
@ -1387,14 +1387,14 @@ impl Editor {
|
|||
egui::UiBuilder::new()
|
||||
.max_rect(Rect::from_min_size(
|
||||
ink.point(280.0, 21.0),
|
||||
Vec2::new(154.0, 34.0),
|
||||
Vec2::new(36.0, 34.0),
|
||||
))
|
||||
.layout(egui::Layout::left_to_right(egui::Align::Center)),
|
||||
|ui| {
|
||||
ui.spacing_mut().interact_size.y = 34.0;
|
||||
ui.spacing_mut().button_padding.x = 16.0;
|
||||
ui.spacing_mut().interact_size = Vec2::new(36.0, 34.0);
|
||||
ui.spacing_mut().button_padding.x = 11.0;
|
||||
let menu =
|
||||
ui.menu_button("Import", |ui| {
|
||||
ui.menu_button(" ", |ui| {
|
||||
ui.set_min_width(225.0);
|
||||
ui.weak("Layer values");
|
||||
let selected = !self.layout.selected_indices().is_empty();
|
||||
|
|
@ -1432,22 +1432,39 @@ impl Editor {
|
|||
self.reference_open = true;
|
||||
}
|
||||
});
|
||||
let c = menu.response.rect.right_center() - Vec2::new(8.0, 0.0);
|
||||
ui.painter().add(egui::Shape::convex_polygon(
|
||||
let response = menu
|
||||
.response
|
||||
.on_hover_text("Import layer values or reference image");
|
||||
response.widget_info(|| {
|
||||
egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Import")
|
||||
});
|
||||
let c = response.rect.center();
|
||||
let stroke = Stroke::new(1.6_f32, if response.hovered() { CYAN } else { TEXT });
|
||||
let p = ui.painter();
|
||||
p.line_segment([c + Vec2::new(0.0, -10.0), c + Vec2::new(0.0, 3.0)], stroke);
|
||||
p.add(egui::Shape::line(
|
||||
vec![
|
||||
c + Vec2::new(-3.0, -2.0),
|
||||
c + Vec2::new(3.0, -2.0),
|
||||
c + Vec2::new(0.0, 2.0),
|
||||
c + Vec2::new(-5.0, -2.0),
|
||||
c + Vec2::new(0.0, 3.0),
|
||||
c + Vec2::new(5.0, -2.0),
|
||||
],
|
||||
MUTED,
|
||||
Stroke::NONE,
|
||||
stroke,
|
||||
));
|
||||
p.add(egui::Shape::line(
|
||||
vec![
|
||||
c + Vec2::new(-9.0, 4.0),
|
||||
c + Vec2::new(-9.0, 9.0),
|
||||
c + Vec2::new(9.0, 9.0),
|
||||
c + Vec2::new(9.0, 4.0),
|
||||
],
|
||||
stroke,
|
||||
));
|
||||
},
|
||||
);
|
||||
ui.scope_builder(
|
||||
egui::UiBuilder::new()
|
||||
.max_rect(Rect::from_min_size(
|
||||
ink.point(362.0, 21.0),
|
||||
ink.point(328.0, 21.0),
|
||||
Vec2::new(100.0, 34.0),
|
||||
))
|
||||
.layout(egui::Layout::left_to_right(egui::Align::Center)),
|
||||
|
|
@ -1459,7 +1476,7 @@ impl Editor {
|
|||
ui.scope_builder(
|
||||
egui::UiBuilder::new()
|
||||
.max_rect(Rect::from_min_size(
|
||||
ink.point(424.0, 21.0),
|
||||
ink.point(390.0, 21.0),
|
||||
Vec2::new(36.0, 34.0),
|
||||
))
|
||||
.layout(egui::Layout::left_to_right(egui::Align::Center)),
|
||||
|
|
@ -2389,7 +2406,7 @@ mod tests {
|
|||
let before = *app.layout.layers();
|
||||
let formats = *app.layout.formats();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let pos = Pos2::new(442.0, 82.0);
|
||||
let pos = Pos2::new(408.0, 82.0);
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
|
|
@ -2641,16 +2658,20 @@ mod tests {
|
|||
let mut requested = false;
|
||||
for label in ["Import", "Clipboard values"] {
|
||||
let output = frame(&mut app, &ctx, vec![]);
|
||||
let pos = output
|
||||
.shapes
|
||||
.iter()
|
||||
.find_map(|s| match &s.shape {
|
||||
egui::epaint::Shape::Text(t) if t.galley.job.text == label => {
|
||||
Some(t.pos + Vec2::new(10.0, 6.0))
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
.unwrap();
|
||||
let pos = if label == "Import" {
|
||||
Pos2::new(298.0, 82.0)
|
||||
} else {
|
||||
output
|
||||
.shapes
|
||||
.iter()
|
||||
.find_map(|s| match &s.shape {
|
||||
egui::epaint::Shape::Text(t) if t.galley.job.text == label => {
|
||||
Some(t.pos + Vec2::new(10.0, 6.0))
|
||||
}
|
||||
_ => None,
|
||||
})
|
||||
.unwrap()
|
||||
};
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
|
|
|
|||
|
|
@ -408,3 +408,6 @@ The toolbar’s **Viewport options** cog contains **Keep aspect ratio when resiz
|
|||
and **Show source-coordinate test pattern in viewport**. Both apply immediately
|
||||
and are preserved in saved projects. Crop editing always previews source content
|
||||
and keeps its proportions, independently of these layer/view preferences.
|
||||
|
||||
The toolbar’s **Import** button uses a downward arrow into a tray. Hover for its
|
||||
label; its dropdown contains SVG, clipboard values, and reference-image actions.
|
||||
|
|
|
|||
Loading…
Reference in New Issue