leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: make rectangle_tracker subscription only return update if there is some

Browse source
This commit is contained in:
Ashley Wulber 2023-05-15 14:22:07 -04:00
parent d38b68244a
commit f433b3dc20
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
1 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

75
src/widget/rectangle_tracker/subscription.rs
View file

@ -14,7 +14,7 @@ pub fn rectangle_tracker_subscription<
R: 'static + Hash + Copy + Send + Sync + Debug + Eq, R: 'static + Hash + Copy + Send + Sync + Debug + Eq,
>( >(
id: I, id: I,
) -> iced::Subscription<Option<(I, RectangleUpdate<R>)>> { ) -> iced::Subscription<(I, RectangleUpdate<R>)> {
subscription::unfold(id, State::Ready, move |state| start_listening(id, state)) subscription::unfold(id, State::Ready, move |state| start_listening(id, state))
} }
@ -26,44 +26,51 @@ pub enum State<I> {
async fn start_listening<I: Copy, R: 'static + Hash + Copy + Send + Sync + Debug + Eq>( async fn start_listening<I: Copy, R: 'static + Hash + Copy + Send + Sync + Debug + Eq>(
id: I, id: I,
state: State<R>, mut state: State<R>,
) -> (Option<(I, RectangleUpdate<R>)>, State<R>) { ) -> ((I, RectangleUpdate<R>), State<R>) {
match state { loop {
State::Ready => { let (update, new_state) = match state {
let (tx, rx) = unbounded(); State::Ready => {
let (tx, rx) = unbounded();
( (
Some((id, RectangleUpdate::Init(RectangleTracker { tx }))), Some((id, RectangleUpdate::Init(RectangleTracker { tx }))),
State::Waiting(rx, HashMap::new()), State::Waiting(rx, HashMap::new()),
) )
} }
State::Waiting(mut rx, mut map) => match rx.next().await { State::Waiting(mut rx, mut map) => match rx.next().await {
Some(u) => { Some(u) => {
if let Some(prev) = map.get(&u.0) { if let Some(prev) = map.get(&u.0) {
let new = u.1; let new = u.1;
if (prev.width - new.width).abs() > 0.1 if (prev.width - new.width).abs() > 0.1
|| (prev.height - new.height).abs() > 0.1 || (prev.height - new.height).abs() > 0.1
|| (prev.x - new.x).abs() > 0.1 || (prev.x - new.x).abs() > 0.1
|| (prev.y - new.y).abs() > 0.1 || (prev.y - new.y).abs() > 0.1
{ {
map.insert(u.0, new); map.insert(u.0, new);
return ( (
Some((id, RectangleUpdate::Rectangle(u))),
State::Waiting(rx, map),
)
} else {
(None, State::Waiting(rx, map))
}
} else {
map.insert(u.0, u.1);
(
Some((id, RectangleUpdate::Rectangle(u))), Some((id, RectangleUpdate::Rectangle(u))),
State::Waiting(rx, map), State::Waiting(rx, map),
); )
} }
} else {
map.insert(u.0, u.1);
return (
Some((id, RectangleUpdate::Rectangle(u))),
State::Waiting(rx, map),
);
} }
(None, State::Waiting(rx, map)) None => (None, State::Finished),
} },
None => (None, State::Finished), State::Finished => iced::futures::future::pending().await,
}, };
State::Finished => iced::futures::future::pending().await, state = new_state;
if let Some(u) = update {
return (u, state);
}
} }
} }