Merge pull request #821 from kevinaboos/upgrade_makepad

Author: kevinaboos

Cargo.lock

@@ -528,10 +528,8 @@ impl WidgetMatchEvent for MainDesktopUI {
                     );
                 }
                 // When dragging a tab, allow it to be dragged
-                DockAction::Drag(drag_event) => {
-                    if drag_event.items.len() == 1 {
-                        self.view.dock(cx, ids!(dock)).accept_drag(cx, drag_event, DragResponse::Move);
-                    }
+                DockAction::Drag(drag_event) if drag_event.items.len() == 1 => {
+                    self.view.dock(cx, ids!(dock)).accept_drag(cx, drag_event, DragResponse::Move);
                 }
                 // When dropping a tab, move it to the new position
                 DockAction::Drop(drop_event) => {

src/home/main_desktop_ui.rs

@@ -4683,16 +4683,14 @@ impl Widget for Message {
         // because we don't want any widgets within the replied-to message to be
         // clickable or otherwise interactive.
         match event.hits(cx, self.view(cx, ids!(replied_to_message)).area()) {
-            Hit::FingerDown(fe) => {
-                if fe.device.mouse_button().is_some_and(|b| b.is_secondary()) {
-                    cx.widget_action(
-                        details.room_screen_widget_uid, 
-                        MessageAction::OpenMessageContextMenu {
-                            details: details.clone(),
-                            abs_pos: fe.abs,
-                        }
-                    );
-                }
+            Hit::FingerDown(fe) if fe.device.mouse_button().is_some_and(|b| b.is_secondary()) => {
+                cx.widget_action(
+                    details.room_screen_widget_uid,
+                    MessageAction::OpenMessageContextMenu {
+                        details: details.clone(),
+                        abs_pos: fe.abs,
+                    }
+                );
             }
             Hit::FingerLongPress(lp) => {
                 cx.widget_action(

src/home/room_screen.rs

@@ -1038,35 +1038,35 @@ impl Widget for SpaceLobbyScreen {
                     }
 
                     // Handle receiving top-level space details (join rule, member count).
-                    Some(SpaceRoomListAction::TopLevelSpaceDetails(sr)) => {
-                        if self.space_name_id.as_ref().is_some_and(|sni| sni.room_id() == &sr.room_id) {
-                            self.space_avatar_state = AvatarState::Known(sr.avatar_url.clone());
-                            self.space_avatar_state.update_from_cache(cx); // prefetch the avatar image
-                            self.view.label(cx, ids!(header.space_info_row.space_info_label)).set_text(cx, &format!(
-                                "{}  ·  {} {}",
-                                match sr.join_rule {
-                                    Some(JoinRuleSummary::Public) => "🌐  Public space",
-                                    _ => "🔒  Private space",
-                                },
-                                sr.num_joined_members,
-                                if sr.num_joined_members == 1 { "member" } else { "members" }
-                            ));
-                            self.redraw(cx);
-                        }
+                    Some(SpaceRoomListAction::TopLevelSpaceDetails(sr))
+                        if self.space_name_id.as_ref().is_some_and(|sni| sni.room_id() == &sr.room_id) =>
+                    {
+                        self.space_avatar_state = AvatarState::Known(sr.avatar_url.clone());
+                        self.space_avatar_state.update_from_cache(cx); // prefetch the avatar image
+                        self.view.label(cx, ids!(header.space_info_row.space_info_label)).set_text(cx, &format!(
+                            "{}  ·  {} {}",
+                            match sr.join_rule {
+                                Some(JoinRuleSummary::Public) => "🌐  Public space",
+                                _ => "🔒  Private space",
+                            },
+                            sr.num_joined_members,
+                            if sr.num_joined_members == 1 { "member" } else { "members" }
+                        ));
+                        self.redraw(cx);
                     }
 
                     // Handle a change to the set of children in this space or any of its child subspaces.
-                    Some(SpaceRoomListAction::UpdatedChildren { space_id, parent_chain, .. }) => {
+                    Some(SpaceRoomListAction::UpdatedChildren { space_id, parent_chain, .. })
                         if self.space_name_id.as_ref().is_some_and(|sni|
                             sni.room_id() == space_id
                             || parent_chain.iter().any(|ancestor_id| sni.room_id() == ancestor_id)
-                        ) {
-                            if let Some(sender) = &self.space_request_sender {
-                                let _ = sender.send(SpaceRequest::GetDetailedChildren {
-                                    space_id: space_id.clone(),
-                                    parent_chain: parent_chain.clone(),
-                                });
-                            }
+                        ) =>
+                    {
+                        if let Some(sender) = &self.space_request_sender {
+                            let _ = sender.send(SpaceRequest::GetDetailedChildren {
+                                space_id: space_id.clone(),
+                                parent_chain: parent_chain.clone(),
+                            });
                         }
                     }
                     _ => { }

src/home/space_lobby.rs

@@ -103,9 +103,9 @@ impl Widget for Avatar {
             Hit::FingerDown(_fde) => {
                 cx.set_key_focus(area);
             }
-            Hit::FingerUp(fue) => if fue.is_over && fue.is_primary_hit() && fue.was_tap() {
+            Hit::FingerUp(fue) if fue.is_over && fue.is_primary_hit() && fue.was_tap() => {
                 cx.widget_action(
-                    widget_uid, 
+                    widget_uid,
                     ShowUserProfileAction::ShowUserProfile(info),
                 );
             }

src/shared/avatar.rs

@@ -121,10 +121,10 @@ impl Widget for CollapsibleHeader {
             Hit::FingerDown(..) => {
                 cx.set_key_focus(self.view.area());
             }
-            Hit::FingerUp(fe) => {
-                if !rooms_list_props.was_scrolling && fe.is_over && fe.is_primary_hit() && fe.was_tap() {
-                    self.toggle_collapse(cx, scope);
-                }
+            Hit::FingerUp(fe)
+                if !rooms_list_props.was_scrolling && fe.is_over && fe.is_primary_hit() && fe.was_tap() =>
+            {
+                self.toggle_collapse(cx, scope);
             }
             _ => { }
         }

src/shared/collapsible_header.rs

@@ -539,11 +539,9 @@ impl Widget for ImageViewer {
         // preventing rotated_image.area() from receiving them.
         // Position checks distinguish image vs. background interactions.
         match event.hits(cx, self.view.area()) {
-            Hit::FingerHoverIn(he) => {
-                if rotated_image.area().rect(cx).contains(he.abs) {
-                    self.mouse_cursor_hover_over_image = true;
-                    cx.set_cursor(MouseCursor::Hand);
-                }
+            Hit::FingerHoverIn(he) if rotated_image.area().rect(cx).contains(he.abs) => {
+                self.mouse_cursor_hover_over_image = true;
+                cx.set_cursor(MouseCursor::Hand);
             }
             Hit::FingerHoverOut(_) => {
                 self.mouse_cursor_hover_over_image = false;
@@ -576,22 +574,20 @@ impl Widget for ImageViewer {
                     self.show_overlay_ui(cx, true);
                 }
             }
-            Hit::FingerDown(fe) => {
-                if fe.is_primary_hit() {
-                    let click_pos = fe.abs;
-                    let on_image = rotated_image.area().rect(cx).contains(click_pos);
-                    let on_buttons = button_group_rounded_view.area().rect(cx).contains(click_pos);
-                    let on_metadata = self.view.view(cx, ids!(metadata_rounded_view))
-                        .area().rect(cx).contains(click_pos);
-                    if on_image {
-                        self.drag_state.drag_start = fe.abs;
-                        if self.drag_state.pan_offset.is_none() {
-                            self.drag_state.pan_offset = Some(DVec2::default());
-                        }
-                    } else if !on_buttons && !on_metadata {
-                        self.reset(cx);
-                        cx.action(ImageViewerAction::Hide);
+            Hit::FingerDown(fe) if fe.is_primary_hit() => {
+                let click_pos = fe.abs;
+                let on_image = rotated_image.area().rect(cx).contains(click_pos);
+                let on_buttons = button_group_rounded_view.area().rect(cx).contains(click_pos);
+                let on_metadata = self.view.view(cx, ids!(metadata_rounded_view))
+                    .area().rect(cx).contains(click_pos);
+                if on_image {
+                    self.drag_state.drag_start = fe.abs;
+                    if self.drag_state.pan_offset.is_none() {
+                        self.drag_state.pan_offset = Some(DVec2::default());
                     }
+                } else if !on_buttons && !on_metadata {
+                    self.reset(cx);
+                    cx.action(ImageViewerAction::Hide);
                 }
             }
             Hit::FingerUp(fe) if fe.is_over && fe.is_primary_hit() => {

src/shared/image_viewer.rs

@@ -694,19 +694,16 @@ pub fn ends_with_href(text: &str) -> bool {
     let mut substr = text.trim_end();
     // Search backwards for a single quote, double quote, or an equals sign.
     match substr.as_bytes().last() {
-        Some(b'\'' | b'"') => {
+        Some(b'\'' | b'"')
             if substr
                 .get(.. substr.len().saturating_sub(1))
                 .map(|s| {
                     substr = s.trim_end();
                     substr.as_bytes().last() == Some(&b'=')
                 })
                 .unwrap_or(false)
-            {
-                substr = &substr[..substr.len().saturating_sub(1)];
-            } else {
-                return false;
-            }
+        => {
+            substr = &substr[..substr.len().saturating_sub(1)];
         }
         Some(b'=') => {
             substr = &substr[..substr.len().saturating_sub(1)];