Match toolbar menus to original dark icon styling

This commit is contained in:
Dandaedre 2026-11-13 15:20:22 +01:00
parent 1849729f8d
commit d25d7a265b
1 changed files with 64 additions and 10 deletions

View File

@ -1384,7 +1384,7 @@ impl Editor {
|ui| {
ui.spacing_mut().interact_size = Vec2::new(36.0, 34.0);
ui.spacing_mut().button_padding.x = 11.0;
let menu = ui.menu_button(" ", |ui| self.alignment_menu(ui));
let menu = toolbar_menu(ui, " ", |ui| self.alignment_menu(ui));
let response = menu.response.on_hover_text("Align selected layers");
response.widget_info(|| {
egui::WidgetInfo::labeled(
@ -1395,7 +1395,12 @@ impl Editor {
});
let c = response.rect.center();
let p = ui.painter();
let stroke = Stroke::new(1.6_f32, TEXT);
let color = if response.hovered() || response.has_focus() {
CYAN
} else {
TEXT
};
let stroke = Stroke::new(1.6_f32, color);
p.line_segment(
[c + Vec2::new(-10.0, -9.0), c + Vec2::new(-10.0, 9.0)],
stroke,
@ -1403,12 +1408,12 @@ impl Editor {
p.rect_filled(
Rect::from_min_size(c + Vec2::new(-6.0, -7.0), Vec2::new(13.0, 5.0)),
0.0,
TEXT,
color,
);
p.rect_filled(
Rect::from_min_size(c + Vec2::new(-6.0, 3.0), Vec2::new(9.0, 5.0)),
0.0,
TEXT,
color,
);
},
);
@ -1422,7 +1427,7 @@ impl Editor {
|ui| {
ui.spacing_mut().interact_size = Vec2::new(36.0, 34.0);
ui.spacing_mut().button_padding.x = 11.0;
let menu = ui.menu_button(" ", |ui| self.import_menu(ui));
let menu = toolbar_menu(ui, " ", |ui| self.import_menu(ui));
let response = menu
.response
.on_hover_text("Import layer values or reference image");
@ -1430,7 +1435,14 @@ impl Editor {
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 stroke = Stroke::new(
1.6_f32,
if response.hovered() || response.has_focus() {
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(
@ -1461,7 +1473,7 @@ impl Editor {
.layout(egui::Layout::left_to_right(egui::Align::Center)),
|ui| {
ui.spacing_mut().interact_size.y = 34.0;
ui.menu_button("Project", |ui| self.project_menu(ui));
toolbar_menu(ui, "Project", |ui| self.project_menu(ui));
},
);
ui.scope_builder(
@ -1474,13 +1486,20 @@ impl Editor {
|ui| {
ui.spacing_mut().interact_size = Vec2::new(36.0, 34.0);
ui.spacing_mut().button_padding.x = 11.0;
let menu = ui.menu_button(" ", |ui| self.viewport_options_menu(ui));
let menu = toolbar_menu(ui, " ", |ui| self.viewport_options_menu(ui));
let response = menu.response.on_hover_text("Viewport options");
response.widget_info(|| {
egui::WidgetInfo::labeled(egui::WidgetType::Button, true, "Viewport options")
});
let center = response.rect.center();
let stroke = Stroke::new(1.6_f32, if response.hovered() { CYAN } else { TEXT });
let stroke = Stroke::new(
1.6_f32,
if response.hovered() || response.has_focus() {
CYAN
} else {
TEXT
},
);
let points = (0..32)
.map(|i| {
let angle = i as f32 * std::f32::consts::TAU / 32.0;
@ -2133,7 +2152,14 @@ fn alignment_icon(
StrokeKind::Inside,
);
let c = rect.center();
let stroke = Stroke::new(1.6_f32, if response.hovered() { CYAN } else { TEXT });
let stroke = Stroke::new(
1.6_f32,
if response.hovered() || response.has_focus() {
CYAN
} else {
TEXT
},
);
let x = match horizontal {
Some(Alignment::Left) => -6.0,
Some(Alignment::Right) => 6.0,
@ -2191,6 +2217,34 @@ enum ToolbarIcon {
Redo,
}
// Match the original toolbar's dark surfaces without changing popup controls.
fn toolbar_menu<R>(
ui: &mut egui::Ui,
title: &str,
contents: impl FnOnce(&mut egui::Ui) -> R,
) -> egui::InnerResponse<Option<R>> {
let original = ui.style().clone();
let widgets = &mut ui.style_mut().visuals.widgets;
for (visuals, fill, border) in [
(&mut widgets.inactive, FIELD, LINE),
(&mut widgets.hovered, PANEL, CYAN),
(&mut widgets.active, PURPLE, CYAN),
(&mut widgets.open, PANEL, CYAN),
] {
visuals.bg_fill = fill;
visuals.weak_bg_fill = fill;
visuals.bg_stroke = Stroke::new(1.0_f32, border);
visuals.corner_radius = egui::CornerRadius::same(4);
visuals.fg_stroke.color = if border == CYAN { CYAN } else { TEXT };
}
let response = ui.menu_button(title, |ui| {
ui.set_style(original.clone());
contents(ui)
});
ui.set_style(original);
response
}
fn toolbar_icon(ui: &mut egui::Ui, rect: Rect, label: &str, icon: ToolbarIcon) -> egui::Response {
let response = ui.interact(rect, ui.id().with(("toolbar", label)), egui::Sense::click());
response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, true, label));