RadioGroup size and padding

druid/src/widget/radio.rs

@@ -21,8 +21,8 @@ use crate::widget::{Axis, CrossAxisAlignment, Flex, Label, LabelText};
 use crate::{theme, Data, LinearGradient, UnitPoint};
 use tracing::{instrument, trace};
 
-const DEFAULT_RADIO_RADIUS: f64 = 7.0;
-const INNER_CIRCLE_RADIUS: f64 = 2.0;
+//const DEFAULT_RADIO_RADIUS: f64 = 7.0;
+//const INNER_CIRCLE_RADIUS: f64 = 2.0;
 /// A group of radio buttons
 #[derive(Debug, Clone)]
 pub struct RadioGroup;
@@ -31,15 +31,15 @@ impl RadioGroup {
     /// Given a vector of `(label_text, enum_variant)` tuples, create a group of Radio buttons
     /// along the vertical axis.
     pub fn column<T: Data + PartialEq>(
-        variants: impl IntoIterator<Item = (impl Into<LabelText<T>> + 'static, T)>,
+        variants: impl IntoIterator<Item = (impl Into<LabelText<T>> + 'static, T, f64, f64)>,
     ) -> impl Widget<T> {
         RadioGroup::for_axis(Axis::Vertical, variants)
     }
 
     /// Given a vector of `(label_text, enum_variant)` tuples, create a group of Radio buttons
     /// along the horizontal axis.
     pub fn row<T: Data + PartialEq>(
-        variants: impl IntoIterator<Item = (impl Into<LabelText<T>> + 'static, T)>,
+        variants: impl IntoIterator<Item = (impl Into<LabelText<T>> + 'static, T, f64, f64)>,
     ) -> impl Widget<T> {
         RadioGroup::for_axis(Axis::Horizontal, variants)
     }
@@ -48,15 +48,15 @@ impl RadioGroup {
     /// along the specified axis.
     pub fn for_axis<T: Data + PartialEq>(
         axis: Axis,
-        variants: impl IntoIterator<Item = (impl Into<LabelText<T>> + 'static, T)>,
+        variants: impl IntoIterator<Item = (impl Into<LabelText<T>> + 'static, T, f64, f64)>,
     ) -> impl Widget<T> {
         let mut col = Flex::for_axis(axis).cross_axis_alignment(CrossAxisAlignment::Start);
         let mut is_first = true;
-        for (label, variant) in variants.into_iter() {
+        for (label, variant, size, padding) in variants.into_iter() {
             if !is_first {
                 col.add_default_spacer();
             }
-            let radio = Radio::new(label, variant);
+            let radio = Radio::new(label, variant, size, padding);
             col.add_child(radio);
             is_first = false;
         }
@@ -68,14 +68,18 @@ impl RadioGroup {
 pub struct Radio<T> {
     variant: T,
     child_label: Label<T>,
+    size: f64,
+    padding: f64
 }
 
 impl<T: Data> Radio<T> {
     /// Create a lone Radio button from label text and an enum variant
-    pub fn new(label: impl Into<LabelText<T>>, variant: T) -> Radio<T> {
+    pub fn new(label: impl Into<LabelText<T>>, variant: T, size: f64, padding: f64) -> Radio<T> {
         Radio {
             variant,
-            child_label: Label::new(label),
+            child_label: Label::new(label).with_text_size(size),
+            size: size,
+            padding: padding
         }
     }
 }
@@ -126,12 +130,12 @@ impl<T: Data + PartialEq> Widget<T> for Radio<T> {
         bc.debug_check("Radio");
 
         let label_size = self.child_label.layout(ctx, bc, data, env);
-        let radio_diam = env.get(theme::BASIC_WIDGET_HEIGHT);
-        let x_padding = env.get(theme::WIDGET_CONTROL_COMPONENT_PADDING);
+        let radio_height = self.size;//env.get(theme::BASIC_WIDGET_HEIGHT);
+        let x_padding = 3.;//env.get(theme::WIDGET_CONTROL_COMPONENT_PADDING);
 
         let desired_size = Size::new(
-            label_size.width + radio_diam + x_padding,
-            radio_diam.max(label_size.height),
+            label_size.width + radio_height + x_padding,
+            radio_height//radio_diam.max(label_size.height),
         );
         let size = bc.constrain(desired_size);
         trace!("Computed size: {}", size);
@@ -140,10 +144,10 @@ impl<T: Data + PartialEq> Widget<T> for Radio<T> {
 
     #[instrument(name = "Radio", level = "trace", skip(self, ctx, data, env))]
     fn paint(&mut self, ctx: &mut PaintCtx, data: &T, env: &Env) {
-        let size = env.get(theme::BASIC_WIDGET_HEIGHT);
-        let x_padding = env.get(theme::WIDGET_CONTROL_COMPONENT_PADDING);
+        let size = self.size;//env.get(theme::BASIC_WIDGET_HEIGHT);
+        let x_padding = self.padding;//env.get(theme::WIDGET_CONTROL_COMPONENT_PADDING);
 
-        let circle = Circle::new((size / 2., size / 2.), DEFAULT_RADIO_RADIUS);
+        let circle = Circle::new((size / 2., size / 2.), size/2.);
 
         // Paint the background
         let background_gradient = LinearGradient::new(
@@ -167,7 +171,7 @@ impl<T: Data + PartialEq> Widget<T> for Radio<T> {
 
         // Check if data enum matches our variant
         if *data == self.variant {
-            let inner_circle = Circle::new((size / 2., size / 2.), INNER_CIRCLE_RADIUS);
+            let inner_circle = Circle::new((size / 2., size / 2.), (size/4.).ceil());
 
             let fill = if ctx.is_disabled() {
                 env.get(theme::DISABLED_TEXT_COLOR)
@@ -179,7 +183,7 @@ impl<T: Data + PartialEq> Widget<T> for Radio<T> {
         }
 
         // Paint the text label
-        self.child_label.draw_at(ctx, (size + x_padding, 0.0));
+        self.child_label.draw_at(ctx, (size + x_padding, (size/(size/2.0)*-1.0+(size/(size/2.0)/2.0).ceil())));
     }
 
     fn debug_state(&self, data: &T) -> DebugState {