update flake and apply clippy lints

Author: ErikMcClure

feather-ui/src/component/mouse_area.rs

@@ -140,10 +140,36 @@ impl super::EventRouter for MouseAreaState {
                     MouseState::Up => {
                         if let Some((last_pos, drag)) =
                             self.lastdown.remove(&(device_id, button as u64))
+                            && area.contains(pos)
                         {
-                            if area.contains(pos) {
-                                return Ok((
-                                    self,
+                            return Ok((
+                                self,
+                                SmallVec::from_iter([
+                                    if drag {
+                                        let diff = pos - last_pos;
+                                        MouseAreaEvent::OnDrag(button, diff / dpi)
+                                    } else {
+                                        MouseAreaEvent::OnClick(button, pos / dpi)
+                                    },
+                                    hover,
+                                ]),
+                            ));
+                        }
+                    }
+                    MouseState::DblClick => {
+                        if let Some((last_pos, drag)) =
+                            self.lastdown.remove(&(device_id, button as u64))
+                            && area.contains(pos)
+                        {
+                            return Ok((
+                                self,
+                                if drag {
+                                    SmallVec::from_iter([
+                                        MouseAreaEvent::OnClick(button, pos / dpi),
+                                        MouseAreaEvent::OnDblClick(button, pos / dpi),
+                                        hover,
+                                    ])
+                                } else {
                                     SmallVec::from_iter([
                                         if drag {
                                             let diff = pos - last_pos;
@@ -152,37 +178,9 @@ impl super::EventRouter for MouseAreaState {
                                             MouseAreaEvent::OnClick(button, pos / dpi)
                                         },
                                         hover,
-                                    ]),
-                                ));
-                            }
-                        }
-                    }
-                    MouseState::DblClick => {
-                        if let Some((last_pos, drag)) =
-                            self.lastdown.remove(&(device_id, button as u64))
-                        {
-                            if area.contains(pos) {
-                                return Ok((
-                                    self,
-                                    if drag {
-                                        SmallVec::from_iter([
-                                            MouseAreaEvent::OnClick(button, pos / dpi),
-                                            MouseAreaEvent::OnDblClick(button, pos / dpi),
-                                            hover,
-                                        ])
-                                    } else {
-                                        SmallVec::from_iter([
-                                            if drag {
-                                                let diff = pos - last_pos;
-                                                MouseAreaEvent::OnDrag(button, diff / dpi)
-                                            } else {
-                                                MouseAreaEvent::OnClick(button, pos / dpi)
-                                            },
-                                            hover,
-                                        ])
-                                    },
-                                ));
-                            }
+                                    ])
+                                },
+                            ));
                         }
                     }
                 }
@@ -222,21 +220,21 @@ impl super::EventRouter for MouseAreaState {
                 }
                 crate::input::TouchState::End => {
                     let hover = Self::hover_event(0, self.hover);
-                    if let Some((last_pos, drag)) = self.lastdown.remove(&(device_id, index)) {
-                        if area.contains(pos.xy()) {
-                            let diff = pos.xy() - last_pos;
-                            return Ok((
-                                self,
-                                SmallVec::from_iter([
-                                    if drag {
-                                        MouseAreaEvent::OnDrag(MouseButton::Left, diff / dpi)
-                                    } else {
-                                        MouseAreaEvent::OnClick(MouseButton::Left, pos.xy() / dpi)
-                                    },
-                                    hover,
-                                ]),
-                            ));
-                        }
+                    if let Some((last_pos, drag)) = self.lastdown.remove(&(device_id, index))
+                        && area.contains(pos.xy())
+                    {
+                        let diff = pos.xy() - last_pos;
+                        return Ok((
+                            self,
+                            SmallVec::from_iter([
+                                if drag {
+                                    MouseAreaEvent::OnDrag(MouseButton::Left, diff / dpi)
+                                } else {
+                                    MouseAreaEvent::OnClick(MouseButton::Left, pos.xy() / dpi)
+                                },
+                                hover,
+                            ]),
+                        ));
                     }
                 }
             },

feather-ui/src/component/scroll_area.rs

@@ -163,11 +163,11 @@ impl super::EventRouter for ScrollAreaState {
                         }
                     }
                     (MouseState::Up, MouseButton::Left) => {
-                        if let Some((last_pos, drag)) = self.lastdown.remove(&(device_id, 0)) {
-                            if area.contains(pos) {
-                                let e = self.apply_scroll(pos - last_pos, &area, &extent, dpi);
-                                return Ok((self, if drag { [e].into() } else { SmallVec::new() }));
-                            }
+                        if let Some((last_pos, drag)) = self.lastdown.remove(&(device_id, 0))
+                            && area.contains(pos)
+                        {
+                            let e = self.apply_scroll(pos - last_pos, &area, &extent, dpi);
+                            return Ok((self, if drag { [e].into() } else { SmallVec::new() }));
                         }
                     }
                     _ => (),
@@ -200,16 +200,16 @@ impl super::EventRouter for ScrollAreaState {
                 }
                 crate::input::TouchState::End => {
                     // TODO: implement kinetic drag
-                    if let Some((last_pos, drag)) = self.lastdown.remove(&(device_id, index)) {
-                        if area.contains(pos.xy()) {
-                            let e = self.apply_scroll(
-                                (pos.xy() - last_pos) * self.stepvec(),
-                                &area,
-                                &extent,
-                                dpi,
-                            );
-                            return Ok((self, if drag { [e].into() } else { SmallVec::new() }));
-                        }
+                    if let Some((last_pos, drag)) = self.lastdown.remove(&(device_id, index))
+                        && area.contains(pos.xy())
+                    {
+                        let e = self.apply_scroll(
+                            (pos.xy() - last_pos) * self.stepvec(),
+                            &area,
+                            &extent,
+                            dpi,
+                        );
+                        return Ok((self, if drag { [e].into() } else { SmallVec::new() }));
                     }
                 }
             },