From dcfe811b5ace453d16c84a2e9560b343bb53a9b0 Mon Sep 17 00:00:00 2001 From: newcomb-luke Date: Fri, 6 May 2022 22:04:44 -0400 Subject: [PATCH 1/4] Fix image button padding on hover --- egui/src/widgets/button.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/egui/src/widgets/button.rs b/egui/src/widgets/button.rs index 9444c676c90..0ff63f3e174 100644 --- a/egui/src/widgets/button.rs +++ b/egui/src/widgets/button.rs @@ -489,18 +489,14 @@ impl Widget for ImageButton { let (expansion, rounding, fill, stroke) = if selected { let selection = ui.visuals().selection; ( - -padding, + Vec2::splat(0.0), Rounding::none(), selection.bg_fill, selection.stroke, ) } else if frame { let visuals = ui.style().interact(&response); - let expansion = if response.hovered { - Vec2::splat(visuals.expansion) - padding - } else { - Vec2::splat(visuals.expansion) - }; + let expansion = Vec2::splat(visuals.expansion); ( expansion, visuals.rounding, From 035c1fe6ab5f5b73800e13d1579bf7ab65f1b386 Mon Sep 17 00:00:00 2001 From: newcomb-luke Date: Sat, 7 May 2022 01:26:10 -0400 Subject: [PATCH 2/4] Added fixes to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 440fa8fc630..4db0881e4d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui-w ## Unreleased * Add `*_released` & `*_clicked` methods for `PointerState`. +* Fixed `ImageButton`'s changing background padding on hover ([#1528](https://github.com/emilk/egui/pull/1595)). ## 0.18.1 - 2022-05-01 * Change `Shape::Callback` from `&dyn Any` to `&mut dyn Any` to support more backends. From 5090d56d804251ce3e9ae975479637fe57227386 Mon Sep 17 00:00:00 2001 From: newcomb-luke Date: Sat, 7 May 2022 01:30:57 -0400 Subject: [PATCH 3/4] Fixed incorrect pull request ID in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4db0881e4d1..7bf4d076397 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui-w ## Unreleased * Add `*_released` & `*_clicked` methods for `PointerState`. -* Fixed `ImageButton`'s changing background padding on hover ([#1528](https://github.com/emilk/egui/pull/1595)). +* Fixed `ImageButton`'s changing background padding on hover ([#1595](https://github.com/emilk/egui/pull/1595)). ## 0.18.1 - 2022-05-01 * Change `Shape::Callback` from `&dyn Any` to `&mut dyn Any` to support more backends. From 4c1ebf948889ad97db445dc56797606bf2f14d54 Mon Sep 17 00:00:00 2001 From: newcomb-luke Date: Tue, 10 May 2022 13:41:03 -0400 Subject: [PATCH 4/4] Changed Vec2::splat(0.0) to Vec2::ZEROS --- egui/src/widgets/button.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/egui/src/widgets/button.rs b/egui/src/widgets/button.rs index 0ff63f3e174..050bb48ac03 100644 --- a/egui/src/widgets/button.rs +++ b/egui/src/widgets/button.rs @@ -489,7 +489,7 @@ impl Widget for ImageButton { let (expansion, rounding, fill, stroke) = if selected { let selection = ui.visuals().selection; ( - Vec2::splat(0.0), + Vec2::ZERO, Rounding::none(), selection.bg_fill, selection.stroke,