Implement reactive-rendering for radio
This commit is contained in:
parent
f6c322f2f9
commit
0c77702187
1 changed files with 32 additions and 11 deletions
|
|
@ -66,6 +66,7 @@ use crate::core::text;
|
||||||
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, Clipboard, Color, Element, Layout, Length, Pixels, Rectangle,
|
Background, Clipboard, Color, Element, Layout, Length, Pixels, Rectangle,
|
||||||
Shell, Size, Theme, Widget,
|
Shell, Size, Theme, Widget,
|
||||||
|
|
@ -147,6 +148,7 @@ where
|
||||||
text_wrapping: text::Wrapping,
|
text_wrapping: text::Wrapping,
|
||||||
font: Option<Renderer::Font>,
|
font: Option<Renderer::Font>,
|
||||||
class: Theme::Class<'a>,
|
class: Theme::Class<'a>,
|
||||||
|
last_status: Option<Status>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Theme, Renderer> Radio<'a, Message, Theme, Renderer>
|
impl<'a, Message, Theme, Renderer> Radio<'a, Message, Theme, Renderer>
|
||||||
|
|
@ -192,6 +194,7 @@ where
|
||||||
text_wrapping: text::Wrapping::default(),
|
text_wrapping: text::Wrapping::default(),
|
||||||
font: None,
|
font: None,
|
||||||
class: Theme::default(),
|
class: Theme::default(),
|
||||||
|
last_status: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -344,6 +347,28 @@ where
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let current_status = {
|
||||||
|
let is_mouse_over = cursor.is_over(layout.bounds());
|
||||||
|
let is_selected = self.is_selected;
|
||||||
|
|
||||||
|
if is_mouse_over {
|
||||||
|
Status::Hovered { is_selected }
|
||||||
|
} else {
|
||||||
|
Status::Active { is_selected }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -369,21 +394,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_selected = self.is_selected;
|
|
||||||
|
|
||||||
let mut children = layout.children();
|
let mut children = layout.children();
|
||||||
|
|
||||||
let status = if is_mouse_over {
|
let style = theme.style(
|
||||||
Status::Hovered { is_selected }
|
&self.class,
|
||||||
} else {
|
self.last_status.unwrap_or(Status::Active {
|
||||||
Status::Active { is_selected }
|
is_selected: self.is_selected,
|
||||||
};
|
}),
|
||||||
|
);
|
||||||
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