Add `border_width` and `border_color` to `Quad`

1 files changed, 19 insertions, 27 deletions

diff --git a/wgpu/src/renderer/widget/radio.rs b/wgpu/src/renderer/widget/radio.rs
index 3c00a4c2..aa1dbadc 100644
--- a/wgpu/src/renderer/widget/radio.rs
+++ b/wgpu/src/renderer/widget/radio.rs
@@ -1,5 +1,5 @@
 use crate::{Primitive, Renderer};
-use iced_native::{radio, Background, MouseCursor, Rectangle};
+use iced_native::{radio, Background, Color, MouseCursor, Rectangle};
 
 const SIZE: f32 = 28.0;
 const DOT_SIZE: f32 = SIZE / 2.0;
@@ -16,30 +16,20 @@ impl radio::Renderer for Renderer {
         is_mouse_over: bool,
         (label, _): Self::Output,
     ) -> Self::Output {
-        let (radio_border, radio_box) = (
-            Primitive::Quad {
-                bounds,
-                background: Background::Color([0.6, 0.6, 0.6].into()),
-                border_radius: (SIZE / 2.0) as u16,
-            },
-            Primitive::Quad {
-                bounds: Rectangle {
-                    x: bounds.x + 1.0,
-                    y: bounds.y + 1.0,
-                    width: bounds.width - 2.0,
-                    height: bounds.height - 2.0,
-                },
-                background: Background::Color(
-                    if is_mouse_over {
-                        [0.90, 0.90, 0.90]
-                    } else {
-                        [0.95, 0.95, 0.95]
-                    }
-                    .into(),
-                ),
-                border_radius: (SIZE / 2.0 - 1.0) as u16,
-            },
-        );
+        let radio = Primitive::Quad {
+            bounds,
+            background: Background::Color(
+                if is_mouse_over {
+                    [0.90, 0.90, 0.90]
+                } else {
+                    [0.95, 0.95, 0.95]
+                }
+                .into(),
+            ),
+            border_radius: (SIZE / 2.0) as u16,
+            border_width: 1,
+            border_color: Color::from_rgb(0.6, 0.6, 0.6),
+        };
 
         (
             Primitive::Group {
@@ -53,11 +43,13 @@ impl radio::Renderer for Renderer {
                         },
                         background: Background::Color([0.3, 0.3, 0.3].into()),
                         border_radius: (DOT_SIZE / 2.0) as u16,
+                        border_width: 0,
+                        border_color: Color::TRANSPARENT,
                     };
 
-                    vec![radio_border, radio_box, radio_circle, label]
+                    vec![radio, radio_circle, label]
                 } else {
-                    vec![radio_border, radio_box, label]
+                    vec![radio, label]
                 },
             },
             if is_mouse_over {