1 files changed, 18 insertions, 44 deletions

diff --git a/wgpu/src/renderer/widget/radio.rs b/wgpu/src/renderer/widget/radio.rs
index 1f17ba28..3c00a4c2 100644
--- a/wgpu/src/renderer/widget/radio.rs
+++ b/wgpu/src/renderer/widget/radio.rs
@@ -1,59 +1,33 @@
 use crate::{Primitive, Renderer};
-use iced_native::{
-    layout, radio, text, Align, Background, Column, Layout, Length,
-    MouseCursor, Point, Radio, Rectangle, Row, Text, Widget,
-};
+use iced_native::{radio, Background, MouseCursor, Rectangle};
 
 const SIZE: f32 = 28.0;
 const DOT_SIZE: f32 = SIZE / 2.0;
 
 impl radio::Renderer for Renderer {
-    fn layout<Message>(
-        &self,
-        radio: &Radio<Message>,
-        limits: &layout::Limits,
-    ) -> layout::Node {
-        Row::<(), Self>::new()
-            .spacing(15)
-            .align_items(Align::Center)
-            .push(
-                Column::new()
-                    .width(Length::Units(SIZE as u16))
-                    .height(Length::Units(SIZE as u16)),
-            )
-            .push(Text::new(&radio.label))
-            .layout(self, limits)
+    fn default_size(&self) -> u32 {
+        SIZE as u32
     }
 
-    fn draw<Message>(
+    fn draw(
         &mut self,
-        radio: &Radio<Message>,
-        layout: Layout<'_>,
-        cursor_position: Point,
+        bounds: Rectangle,
+        is_selected: bool,
+        is_mouse_over: bool,
+        (label, _): Self::Output,
     ) -> Self::Output {
-        let bounds = layout.bounds();
-        let mut children = layout.children();
-
-        let radio_bounds = children.next().unwrap().bounds();
-        let label_layout = children.next().unwrap();
-
-        let (label, _) =
-            text::Renderer::draw(self, &Text::new(&radio.label), label_layout);
-
-        let is_mouse_over = bounds.contains(cursor_position);
-
         let (radio_border, radio_box) = (
             Primitive::Quad {
-                bounds: radio_bounds,
+                bounds,
                 background: Background::Color([0.6, 0.6, 0.6].into()),
                 border_radius: (SIZE / 2.0) as u16,
             },
             Primitive::Quad {
                 bounds: Rectangle {
-                    x: radio_bounds.x + 1.0,
-                    y: radio_bounds.y + 1.0,
-                    width: radio_bounds.width - 2.0,
-                    height: radio_bounds.height - 2.0,
+                    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 {
@@ -69,13 +43,13 @@ impl radio::Renderer for Renderer {
 
         (
             Primitive::Group {
-                primitives: if radio.is_selected {
+                primitives: if is_selected {
                     let radio_circle = Primitive::Quad {
                         bounds: Rectangle {
-                            x: radio_bounds.x + DOT_SIZE / 2.0,
-                            y: radio_bounds.y + DOT_SIZE / 2.0,
-                            width: radio_bounds.width - DOT_SIZE,
-                            height: radio_bounds.height - DOT_SIZE,
+                            x: bounds.x + DOT_SIZE / 2.0,
+                            y: bounds.y + DOT_SIZE / 2.0,
+                            width: bounds.width - DOT_SIZE,
+                            height: bounds.height - DOT_SIZE,
                         },
                         background: Background::Color([0.3, 0.3, 0.3].into()),
                         border_radius: (DOT_SIZE / 2.0) as u16,