Draw focus on transparent buttons with no padding

Closes #209
khonsulabs · Nov 16, 2024 · 57ed098 · 57ed098
1 parent 4e274cc
commit 57ed098
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/widgets/button.rs b/src/widgets/button.rs
@@ -399,8 +399,10 @@ impl Widget for Button {
                 }
                 .with_alpha(128);
 
-                let inset = (context.get(&IntrinsicPadding).into_px(context.gfx.scale())
-                    - outline_options.line_width)
+                let inset = context
+                    .get(&IntrinsicPadding)
+                    .into_px(context.gfx.scale())
+                    .min(outline_options.line_width)
                     / 2;
 
                 let options = outline_options.colored(color);
@@ -506,10 +508,16 @@ impl Widget for Button {
         available_space: Size<crate::ConstraintLimit>,
         context: &mut LayoutContext<'_, '_, '_, '_>,
     ) -> Size<UPx> {
+        let outline_width = context
+            .get(&OutlineWidth)
+            .into_upx(context.gfx.scale())
+            .ceil();
         let padding = context
             .get(&IntrinsicPadding)
             .into_upx(context.gfx.scale())
-            .round();
+            .round()
+            .max(outline_width);
+
         let double_padding = padding * 2;
         let mounted = self.content.mounted(context);
         let available_space = available_space.map(|space| space - double_padding);