skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some distance between parent menu and submenu (#4230) 

Before:
<img width="502" alt="Screenshot 2024-03-26 at 08 37 16"
src="https://github.com/emilk/egui/assets/1148717/ca072cae-807a-4830-a59a-11ff822d0a7b">


After:
<img width="532" alt="Screenshot 2024-03-26 at 08 36 12"
src="https://github.com/emilk/egui/assets/1148717/f42d79f4-ff05-457f-9fab-67574839f025">
This commit is contained in:
Emil Ernerfeldt 2024-03-26 08:43:38 +01:00 committed by GitHub
parent ab6c3f9161
commit cf8c37c71e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/egui/src/menu.rs
View File

@ -151,20 +151,22 @@ pub(crate) fn menu_ui<'c, R>(
.constrain_to(ctx.screen_rect()) .constrain_to(ctx.screen_rect())
.interactable(true); .interactable(true);
area.show(ctx, |ui| { let area_response = area.show(ctx, |ui| {
set_menu_style(ui.style_mut()); set_menu_style(ui.style_mut());
let frame = Frame::menu(ui.style()).show(ui, |ui| { Frame::menu(ui.style())
ui.set_max_width(ui.spacing().menu_width); .show(ui, |ui| {
ui.set_menu_state(Some(menu_state_arc.clone())); ui.set_max_width(ui.spacing().menu_width);
ui.with_layout(Layout::top_down_justified(Align::LEFT), add_contents) ui.set_menu_state(Some(menu_state_arc.clone()));
.inner ui.with_layout(Layout::top_down_justified(Align::LEFT), add_contents)
}); .inner
})
.inner
});
menu_state_arc.write().rect = frame.response.rect; menu_state_arc.write().rect = area_response.response.rect;
frame.inner area_response
})
} }
/// Build a top level menu with a button. /// Build a top level menu with a button.
@ -549,7 +551,8 @@ pub(crate) struct MenuState {
/// The opened sub-menu and its [`Id`] /// The opened sub-menu and its [`Id`]
sub_menu: Option<(Id, Arc<RwLock<MenuState>>)>, sub_menu: Option<(Id, Arc<RwLock<MenuState>>)>,
/// Bounding box of this menu (without the sub-menu) /// Bounding box of this menu (without the sub-menu),
/// including the frame and everything.
pub rect: Rect, pub rect: Rect,
/// Used to check if any menu in the tree wants to close /// Used to check if any menu in the tree wants to close
@ -620,7 +623,8 @@ impl MenuState {
// ensure to repaint once even when pointer is not moving // ensure to repaint once even when pointer is not moving
ui.ctx().request_repaint(); ui.ctx().request_repaint();
} else if !open && button.hovered() { } else if !open && button.hovered() {
let pos = button.rect.right_top(); let mut pos = button.rect.right_top();
pos.x = self.rect.right() + ui.spacing().menu_spacing;
self.open_submenu(sub_id, pos); self.open_submenu(sub_id, pos);
} else if open } else if open
&& ui.interact_bg(Sense::hover()).contains_pointer() && ui.interact_bg(Sense::hover()).contains_pointer()

10
crates/egui/src/style.rs
View File

@ -311,6 +311,9 @@ pub struct Spacing {
/// The default width of a menu. /// The default width of a menu.
pub menu_width: f32, pub menu_width: f32,
/// Horizontal distance between a menu and a submenu.
pub menu_spacing: f32,
/// End indented regions with a horizontal line /// End indented regions with a horizontal line
pub indent_ends_with_horizontal_line: bool, pub indent_ends_with_horizontal_line: bool,
@ -1239,6 +1242,7 @@ impl Default for Spacing {
icon_spacing: 4.0, icon_spacing: 4.0,
tooltip_width: 600.0, tooltip_width: 600.0,
menu_width: 150.0, menu_width: 150.0,
menu_spacing: 3.0,
combo_height: 200.0, combo_height: 200.0,
scroll: Default::default(), scroll: Default::default(),
indent_ends_with_horizontal_line: false, indent_ends_with_horizontal_line: false,
@ -1592,6 +1596,7 @@ impl Spacing {
icon_spacing, icon_spacing,
tooltip_width, tooltip_width,
menu_width, menu_width,
menu_spacing,
indent_ends_with_horizontal_line, indent_ends_with_horizontal_line,
combo_height, combo_height,
scroll, scroll,
@ -1659,6 +1664,11 @@ impl Spacing {
ui.label("Default width of a menu"); ui.label("Default width of a menu");
}); });
ui.horizontal(|ui| {
ui.add(DragValue::new(menu_spacing).clamp_range(0.0..=10.0));
ui.label("Horizontal spacing between menus");
});
ui.checkbox( ui.checkbox(
indent_ends_with_horizontal_line, indent_ends_with_horizontal_line,
"End indented regions with a horizontal separator", "End indented regions with a horizontal separator",