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

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

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,9 +26,10 @@ 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 {
let (update, new_state) = match state {
State::Ready => { State::Ready => {
let (tx, rx) = unbounded(); let (tx, rx) = unbounded();
@ -47,23 +48,29 @@ async fn start_listening<I: Copy, R: 'static + Hash + Copy + Send + Sync + Debug
|| (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))), Some((id, RectangleUpdate::Rectangle(u))),
State::Waiting(rx, map), State::Waiting(rx, map),
); )
} else {
(None, State::Waiting(rx, map))
} }
} else { } else {
map.insert(u.0, u.1); map.insert(u.0, u.1);
return ( (
Some((id, RectangleUpdate::Rectangle(u))), Some((id, RectangleUpdate::Rectangle(u))),
State::Waiting(rx, map), 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);
}
} }
} }