me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace Option<Instant> with RedrawRequest enum

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-01-12 05:18:25 +01:00
parent 502c9bfbf6
commit e2ddef7438
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
8 changed files with 84 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
native/src/user_interface.rs
View file

@ -5,10 +5,9 @@ use crate::layout;
use crate::mouse;
use crate::renderer;
use crate::widget;
use crate::window;
use crate::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
use std::time::Instant;
/// A set of interactive graphical elements with a specific [`Layout`].
///
/// It can be updated and drawn.
@ -191,7 +190,7 @@ where
use std::mem::ManuallyDrop;
let mut outdated = false;
let mut redraw_requested_at = None;
let mut redraw_request = None;
let mut manual_overlay =
ManuallyDrop::new(self.root.as_widget_mut().overlay(
@ -221,12 +220,12 @@ where
event_statuses.push(event_status);
match (redraw_requested_at, shell.redraw_requested_at()) {
match (redraw_request, shell.redraw_request()) {
(None, Some(at)) => {
redraw_requested_at = Some(at);
redraw_request = Some(at);
}
(Some(current), Some(new)) if new < current => {
redraw_requested_at = Some(new);
redraw_request = Some(new);
}
_ => {}
}
@ -303,12 +302,12 @@ where
self.overlay = None;
}
match (redraw_requested_at, shell.redraw_requested_at()) {
match (redraw_request, shell.redraw_request()) {
(None, Some(at)) => {
redraw_requested_at = Some(at);
redraw_request = Some(at);
}
(Some(current), Some(new)) if new < current => {
redraw_requested_at = Some(new);
redraw_request = Some(new);
}
_ => {}
}
@ -334,9 +333,7 @@ where
if outdated {
State::Outdated
} else {
State::Updated {
redraw_requested_at,
}
State::Updated { redraw_request }
},
event_statuses,
)
@ -594,6 +591,6 @@ pub enum State {
/// rebuilding.
Updated {
/// The [`Instant`] when a redraw should be performed.
redraw_requested_at: Option<Instant>,
redraw_request: Option<window::RedrawRequest>,
},
}