From 021faf20ea20bdfa4d592b0a9c96ebb79dbb00d6 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 1 Feb 2024 13:24:58 +0100 Subject: Simplify `draw` logic in `Checkbox` --- widget/src/checkbox.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs index 565c5133..0ff4d58b 100644 --- a/widget/src/checkbox.rs +++ b/widget/src/checkbox.rs @@ -292,18 +292,16 @@ where viewport: &Rectangle, ) { let is_mouse_over = cursor.is_over(layout.bounds()); - let is_enabled = self.on_toggle.is_some(); + let is_disabled = self.on_toggle.is_none(); let mut children = layout.children(); - let custom_style = if is_enabled { - if is_mouse_over { - theme.hovered(&self.style, self.is_checked) - } else { - theme.active(&self.style, self.is_checked) - } - } else { + let custom_style = if is_disabled { theme.disabled(&self.style, self.is_checked) + } else if is_mouse_over { + theme.hovered(&self.style, self.is_checked) + } else { + theme.active(&self.style, self.is_checked) }; { -- cgit