From e1af88748bcd5bc0d26de447e20693fbd7788f5a Mon Sep 17 00:00:00 2001 From: adrien <221212@umons.ac.be> Date: Mon, 10 Nov 2025 17:12:57 +0100 Subject: [PATCH] more pixel diff fix --- crates/egui/src/widgets/button.rs | 1 + crates/egui/src/widgets/label.rs | 2 +- .../tests/snapshots/menu/closed_hovered.png | 4 +- .../tests/snapshots/menu/opened.png | 4 +- .../tests/snapshots/menu/submenu.png | 4 +- .../tests/snapshots/menu/subsubmenu.png | 4 +- examples/hello_world_simple/src/main.rs | 46 +++++++++++++++++++ 7 files changed, 56 insertions(+), 9 deletions(-) diff --git a/crates/egui/src/widgets/button.rs b/crates/egui/src/widgets/button.rs index 5f0a43d30..28ed06bae 100644 --- a/crates/egui/src/widgets/button.rs +++ b/crates/egui/src/widgets/button.rs @@ -299,6 +299,7 @@ impl<'a> Button<'a> { } else { Margin::ZERO }; + if small { button_padding.bottom = 0; button_padding.top = 0; diff --git a/crates/egui/src/widgets/label.rs b/crates/egui/src/widgets/label.rs index 035485f5b..86259ab2a 100644 --- a/crates/egui/src/widgets/label.rs +++ b/crates/egui/src/widgets/label.rs @@ -323,4 +323,4 @@ impl Widget for Label { response } -} \ No newline at end of file +} diff --git a/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png b/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png index 7f6820276..5d46f1f0f 100644 --- a/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png +++ b/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ed9c5dca0551d8e6177dc67def3e8819036e39d935e11f9ee77a974dd7a3306 -size 10938 +oid sha256:73b09338bca2da64869595df0a8f990e9091ea0bde15820c572d343b4d1c4bb5 +size 10807 diff --git a/crates/egui_kittest/tests/snapshots/menu/opened.png b/crates/egui_kittest/tests/snapshots/menu/opened.png index 44f9e1e31..c4bf4e70d 100644 --- a/crates/egui_kittest/tests/snapshots/menu/opened.png +++ b/crates/egui_kittest/tests/snapshots/menu/opened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f765cc56eb84b14d0c7d7804c5ec24f90ea8ba14ee288787aa5131d58365629 -size 22072 +oid sha256:58a58e1db828dbcb2a770c6add716950edcd359c911f3348613ffd8bb7dbeaa2 +size 21812 diff --git a/crates/egui_kittest/tests/snapshots/menu/submenu.png b/crates/egui_kittest/tests/snapshots/menu/submenu.png index ee122f962..e6e8fdb6f 100644 --- a/crates/egui_kittest/tests/snapshots/menu/submenu.png +++ b/crates/egui_kittest/tests/snapshots/menu/submenu.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27c85c456e69f4d885ccf9af606e426138f6ca6b8e0762ea4806d6cc8225382c -size 29569 +oid sha256:f9786fbc273adeb88a79d4917d8b3da742604644a78b122b7c1307006ac3c581 +size 29252 diff --git a/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png b/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png index eb4692afe..1a254947d 100644 --- a/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png +++ b/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:231c72b67e733d7c12e76d28c4702cef9490d169e80f1388ad0b5276bd7184fc -size 34175 +oid sha256:acdf4b04a4a69b69a255187f7a82e566860d278c5982a34166b3ed2c9435766a +size 34061 diff --git a/examples/hello_world_simple/src/main.rs b/examples/hello_world_simple/src/main.rs index 4fe49a89d..d3a3ad0fc 100644 --- a/examples/hello_world_simple/src/main.rs +++ b/examples/hello_world_simple/src/main.rs @@ -28,6 +28,52 @@ fn main() -> eframe::Result { age += 1; } ui.label(format!("Hello '{name}', age {age}")); + + egui::MenuBar::new().ui(ui, |ui| { + ui.menu_button("File", |ui| { + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + }); + ui.menu_button("test", |ui| { + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + }); + ui.menu_button("azea", |ui| { + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + ui.menu_button("test", |ui| { + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + }); + }); + ui.menu_button("vrzzzde", |ui| { + if ui.button("Quit").clicked() { + ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close); + } + }); + }); }); }) }