Simplify draw logic in Checkbox
This commit is contained in:
parent
faeb4536b3
commit
021faf20ea
1 changed files with 6 additions and 8 deletions
|
|
@ -292,18 +292,16 @@ where
|
||||||
viewport: &Rectangle,
|
viewport: &Rectangle,
|
||||||
) {
|
) {
|
||||||
let is_mouse_over = cursor.is_over(layout.bounds());
|
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 mut children = layout.children();
|
||||||
|
|
||||||
let custom_style = if is_enabled {
|
let custom_style = if is_disabled {
|
||||||
if is_mouse_over {
|
|
||||||
theme.hovered(&self.style, self.is_checked)
|
|
||||||
} else {
|
|
||||||
theme.active(&self.style, self.is_checked)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
theme.disabled(&self.style, self.is_checked)
|
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)
|
||||||
};
|
};
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue