From a92e43d839da8f8a3c1d9b7e73819175852c1fa8 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Sat, 11 Nov 2023 01:10:05 +0100
Subject: [PATCH] fix(button): image button rendering fixes

---
 src/theme/style/button.rs   | 27 +++++++++-----
 src/widget/button/image.rs  |  2 +-
 src/widget/button/style.rs  |  3 ++
 src/widget/button/widget.rs | 72 +++++++++++++++++++++----------------
 4 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/src/theme/style/button.rs b/src/theme/style/button.rs
index 68e19322520..499c97ed93c 100644
--- a/src/theme/style/button.rs
+++ b/src/theme/style/button.rs
@@ -82,7 +82,7 @@ pub fn appearance(
         }
 
         Button::Image => {
-            appearance.background = Some(Background::Color(cosmic.bg_color().into()));
+            appearance.background = None;
             appearance.text_color = Some(cosmic.accent.base.into());
             appearance.icon_color = Some(cosmic.accent.base.into());
 
@@ -90,7 +90,7 @@ pub fn appearance(
             appearance.border_radius = (*corner_radii).into();
 
             if focused {
-                appearance.border_width = 3.0;
+                appearance.border_width = 2.0;
                 appearance.border_color = cosmic.accent.base.into();
             }
 
@@ -178,13 +178,18 @@ impl StyleSheet for crate::Theme {
             return hovered(focused, self);
         }
 
-        appearance(self, focused, style, |component| {
-            (
-                component.hover.into(),
-                Some(component.on.into()),
-                Some(component.on.into()),
-            )
-        })
+        appearance(
+            self,
+            focused || matches!(style, Button::Image),
+            style,
+            |component| {
+                (
+                    component.hover.into(),
+                    Some(component.on.into()),
+                    Some(component.on.into()),
+                )
+            },
+        )
     }
 
     fn pressed(&self, focused: bool, style: &Self::Style) -> Appearance {
@@ -200,4 +205,8 @@ impl StyleSheet for crate::Theme {
             )
         })
     }
+
+    fn selection_background(&self) -> Background {
+        Background::Color(self.cosmic().bg_color().into())
+    }
 }
diff --git a/src/widget/button/image.rs b/src/widget/button/image.rs
index 1108d599c9a..1fbd6edbdaf 100644
--- a/src/widget/button/image.rs
+++ b/src/widget/button/image.rs
@@ -62,9 +62,9 @@ where
             .width(builder.width)
             .height(builder.height)
             .apply(widget::button)
+            .padding(0)
             .selected(builder.variant.selected)
             .id(builder.id)
-            .padding(0)
             .on_press_maybe(builder.on_press)
             .style(builder.style)
             .into()
diff --git a/src/widget/button/style.rs b/src/widget/button/style.rs
index 8c4c998d748..644aedb614d 100644
--- a/src/widget/button/style.rs
+++ b/src/widget/button/style.rs
@@ -80,4 +80,7 @@ pub trait StyleSheet {
 
     /// Produces the pressed [`Appearance`] of a button.
     fn pressed(&self, focused: bool, style: &Self::Style) -> Appearance;
+
+    /// Background color of the selection indicator
+    fn selection_background(&self) -> Background;
 }
diff --git a/src/widget/button/widget.rs b/src/widget/button/widget.rs
index 88459ca6990..46a35e511e9 100644
--- a/src/widget/button/widget.rs
+++ b/src/widget/button/widget.rs
@@ -154,7 +154,7 @@ where
     /// Sets the widget to a selected state.
     ///
     /// Displays a selection indicator on image buttons.
-    pub(super) fn selected(mut self, selected: bool) -> Self {
+    pub fn selected(mut self, selected: bool) -> Self {
         self.selected = selected.then(|| Selected {
             icon: crate::widget::icon::from_name("object-select-symbolic")
                 .size(16)
@@ -323,20 +323,21 @@ where
             theme,
             &self.style,
             || tree.state.downcast_ref::<State>(),
-        );
-
-        self.content.as_widget().draw(
-            &tree.children[0],
-            renderer,
-            theme,
-            &renderer::Style {
-                icon_color: styling.icon_color.unwrap_or(renderer_style.icon_color),
-                text_color: styling.text_color.unwrap_or(renderer_style.icon_color),
-                scale_factor: renderer_style.scale_factor,
+            |renderer, styling| {
+                self.content.as_widget().draw(
+                    &tree.children[0],
+                    renderer,
+                    theme,
+                    &renderer::Style {
+                        icon_color: styling.icon_color.unwrap_or(renderer_style.icon_color),
+                        text_color: styling.text_color.unwrap_or(renderer_style.icon_color),
+                        scale_factor: renderer_style.scale_factor,
+                    },
+                    content_layout,
+                    cursor,
+                    &bounds,
+                );
             },
-            content_layout,
-            cursor,
-            &bounds,
         );
 
         if let Some(ref selected) = self.selected {
@@ -345,16 +346,14 @@ where
                     bounds: Rectangle {
                         width: 24.0,
                         height: 20.0,
-                        x: bounds.x,
-                        y: bounds.y + (bounds.height - 20.0),
+                        x: bounds.x + styling.border_width,
+                        y: bounds.y + (bounds.height - 20.0 - styling.border_width),
                     },
                     border_radius: [0.0, 8.0, 0.0, 8.0].into(),
                     border_width: 0.0,
                     border_color: Color::TRANSPARENT,
                 },
-                styling
-                    .background
-                    .unwrap_or(Background::Color(Color::TRANSPARENT)),
+                theme.selection_background(),
             );
 
             iced_core::svg::Renderer::draw(
@@ -364,8 +363,8 @@ where
                 Rectangle {
                     width: 16.0,
                     height: 16.0,
-                    x: bounds.x + 4.0,
-                    y: bounds.y + (bounds.height - 16.0),
+                    x: bounds.x + 5.0 + styling.border_width,
+                    y: bounds.y + (bounds.height - 18.0 - styling.border_width),
                 },
             );
         }
@@ -604,6 +603,7 @@ pub fn draw<'a, Renderer: iced_core::Renderer>(
     style_sheet: &dyn StyleSheet<Style = <Renderer::Theme as StyleSheet>::Style>,
     style: &<Renderer::Theme as StyleSheet>::Style,
     state: impl FnOnce() -> &'a State,
+    draw_contents: impl FnOnce(&mut Renderer, Appearance),
 ) -> Appearance
 where
     Renderer::Theme: StyleSheet,
@@ -663,22 +663,34 @@ where
             );
         }
 
+        // Draw the button background first.
+        if let Some(background) = styling.background {
+            renderer.fill_quad(
+                renderer::Quad {
+                    bounds,
+                    border_radius: styling.border_radius,
+                    border_width: 0.0,
+                    border_color: Color::TRANSPARENT,
+                },
+                background,
+            );
+        }
+
+        // Then draw the button contents onto the background.
+        draw_contents(renderer, styling);
+
+        // Finish by drawing the border above the contents.
         renderer.fill_quad(
             renderer::Quad {
-                bounds: Rectangle {
-                    x: bounds.x + if is_selected { -1.0 } else { 0.0 },
-                    y: bounds.y + if is_selected { -1.0 } else { 0.0 },
-                    width: bounds.width + if is_selected { 2.0 } else { 0.0 },
-                    height: bounds.height + if is_selected { 2.0 } else { 0.0 },
-                },
+                bounds,
                 border_radius: styling.border_radius,
                 border_width: styling.border_width,
                 border_color: styling.border_color,
             },
-            styling
-                .background
-                .unwrap_or(Background::Color(Color::TRANSPARENT)),
+            Color::TRANSPARENT,
         );
+    } else {
+        draw_contents(renderer, styling);
     }
 
     styling