Implement reactive-rendering for checkbox
This commit is contained in:
parent
0691e617f3
commit
f6c322f2f9
1 changed files with 35 additions and 14 deletions
|
|
@ -40,6 +40,7 @@ use crate::core::theme::palette;
|
||||||
use crate::core::touch;
|
use crate::core::touch;
|
||||||
use crate::core::widget;
|
use crate::core::widget;
|
||||||
use crate::core::widget::tree::{self, Tree};
|
use crate::core::widget::tree::{self, Tree};
|
||||||
|
use crate::core::window;
|
||||||
use crate::core::{
|
use crate::core::{
|
||||||
Background, Border, Clipboard, Color, Element, Layout, Length, Pixels,
|
Background, Border, Clipboard, Color, Element, Layout, Length, Pixels,
|
||||||
Rectangle, Shell, Size, Theme, Widget,
|
Rectangle, Shell, Size, Theme, Widget,
|
||||||
|
|
@ -100,6 +101,7 @@ pub struct Checkbox<
|
||||||
font: Option<Renderer::Font>,
|
font: Option<Renderer::Font>,
|
||||||
icon: Icon<Renderer::Font>,
|
icon: Icon<Renderer::Font>,
|
||||||
class: Theme::Class<'a>,
|
class: Theme::Class<'a>,
|
||||||
|
last_status: Option<Status>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Theme, Renderer> Checkbox<'a, Message, Theme, Renderer>
|
impl<'a, Message, Theme, Renderer> Checkbox<'a, Message, Theme, Renderer>
|
||||||
|
|
@ -139,6 +141,7 @@ where
|
||||||
shaping: text::Shaping::Basic,
|
shaping: text::Shaping::Basic,
|
||||||
},
|
},
|
||||||
class: Theme::default(),
|
class: Theme::default(),
|
||||||
|
last_status: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -326,6 +329,31 @@ where
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let current_status = {
|
||||||
|
let is_mouse_over = cursor.is_over(layout.bounds());
|
||||||
|
let is_disabled = self.on_toggle.is_none();
|
||||||
|
let is_checked = self.is_checked;
|
||||||
|
|
||||||
|
if is_disabled {
|
||||||
|
Status::Disabled { is_checked }
|
||||||
|
} else if is_mouse_over {
|
||||||
|
Status::Hovered { is_checked }
|
||||||
|
} else {
|
||||||
|
Status::Active { is_checked }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Event::Window(window::Event::RedrawRequested(_now)) = event {
|
||||||
|
self.last_status = Some(current_status);
|
||||||
|
} else {
|
||||||
|
match self.last_status {
|
||||||
|
Some(status) if status != current_status => {
|
||||||
|
shell.request_redraw(window::RedrawRequest::NextFrame);
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
event::Status::Ignored
|
event::Status::Ignored
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -351,24 +379,17 @@ where
|
||||||
theme: &Theme,
|
theme: &Theme,
|
||||||
defaults: &renderer::Style,
|
defaults: &renderer::Style,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor: mouse::Cursor,
|
_cursor: mouse::Cursor,
|
||||||
viewport: &Rectangle,
|
viewport: &Rectangle,
|
||||||
) {
|
) {
|
||||||
let is_mouse_over = cursor.is_over(layout.bounds());
|
|
||||||
let is_disabled = self.on_toggle.is_none();
|
|
||||||
let is_checked = self.is_checked;
|
|
||||||
|
|
||||||
let mut children = layout.children();
|
let mut children = layout.children();
|
||||||
|
|
||||||
let status = if is_disabled {
|
let style = theme.style(
|
||||||
Status::Disabled { is_checked }
|
&self.class,
|
||||||
} else if is_mouse_over {
|
self.last_status.unwrap_or(Status::Disabled {
|
||||||
Status::Hovered { is_checked }
|
is_checked: self.is_checked,
|
||||||
} else {
|
}),
|
||||||
Status::Active { is_checked }
|
);
|
||||||
};
|
|
||||||
|
|
||||||
let style = theme.style(&self.class, status);
|
|
||||||
|
|
||||||
{
|
{
|
||||||
let layout = children.next().unwrap();
|
let layout = children.next().unwrap();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue