summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-09-06 15:02:55 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-09-06 15:02:55 +0200
commitf6dda3b2f584e0bfd7071bde9aaadc81b3bc9c4f (patch)
treeb1395b1167dc187ffc284b5d366a94a05d573a9b /graphics
parentff15ebc54778dee2a7262469c8a2bcd5abecd4d1 (diff)
downloadiced-f6dda3b2f584e0bfd7071bde9aaadc81b3bc9c4f.tar.gz
iced-f6dda3b2f584e0bfd7071bde9aaadc81b3bc9c4f.tar.bz2
iced-f6dda3b2f584e0bfd7071bde9aaadc81b3bc9c4f.zip
Fix `Radio` border radius when using custom size
Diffstat (limited to 'graphics')
-rw-r--r--graphics/src/widget/radio.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/graphics/src/widget/radio.rs b/graphics/src/widget/radio.rs
index dd8b5f17..da41ac47 100644
--- a/graphics/src/widget/radio.rs
+++ b/graphics/src/widget/radio.rs
@@ -13,16 +13,13 @@ pub use iced_style::radio::{Style, StyleSheet};
pub type Radio<Message, Backend> =
iced_native::Radio<Message, Renderer<Backend>>;
-const SIZE: f32 = 28.0;
-const DOT_SIZE: f32 = SIZE / 2.0;
-
impl<B> radio::Renderer for Renderer<B>
where
B: Backend,
{
type Style = Box<dyn StyleSheet>;
- const DEFAULT_SIZE: u16 = SIZE as u16;
+ const DEFAULT_SIZE: u16 = 28;
const DEFAULT_SPACING: u16 = 15;
fn draw(
@@ -39,10 +36,13 @@ where
style_sheet.active()
};
+ let size = bounds.width;
+ let dot_size = size / 2.0;
+
let radio = Primitive::Quad {
bounds,
background: style.background,
- border_radius: (SIZE / 2.0) as u16,
+ border_radius: (size / 2.0) as u16,
border_width: style.border_width,
border_color: style.border_color,
};
@@ -52,13 +52,13 @@ where
primitives: if is_selected {
let radio_circle = Primitive::Quad {
bounds: Rectangle {
- x: bounds.x + DOT_SIZE / 2.0,
- y: bounds.y + DOT_SIZE / 2.0,
- width: bounds.width - DOT_SIZE,
- height: 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(style.dot_color),
- border_radius: (DOT_SIZE / 2.0) as u16,
+ border_radius: (dot_size / 2.0) as u16,
border_width: 0,
border_color: Color::TRANSPARENT,
};