fix clippy

Author: alanpoon

Cargo.lock

@@ -16,7 +16,7 @@ version = "0.0.1-pre-alpha-4"
 metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
-makepad-widgets = { git = "https://github.com/alanpoon/makepad", branch = "rotated_image_set_texture" }
+makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"

Cargo.toml

@@ -557,11 +557,11 @@ impl AppMain for App {
         }
 
         // If the image viewer modal is really opened, handles non-Draw events using the modal.
-        let image_viewer_modal = self.ui.modal(id!(image_viewer));
+        let image_viewer_modal = self.ui.modal(ids!(image_viewer));
         if image_viewer_modal.is_open() &&image_viewer_modal.area().rect(cx).size.y > 200.0 {
             let scope = &mut Scope::with_data(&mut self.app_state);
-            self.ui.view(id!(popup_list)).handle_event(cx, event, scope);
-            self.ui.modal(id!(image_viewer)).handle_event(cx, event, scope);
+            self.ui.view(ids!(popup_list)).handle_event(cx, event, scope);
+            self.ui.modal(ids!(image_viewer)).handle_event(cx, event, scope);
             // Pass the Signal event to the underlying room screen, so as to populate the full image in the image viewer.
             if let Event::Signal = event {
                 self.ui.handle_event(cx, event, scope);
@@ -687,43 +687,45 @@ impl App {
 
     /// Handles actions for the image viewer.
     /// Returns a boolean, is true continues the actions for loop.
-    fn handle_image_viewer_action(&mut self, cx: &mut Cx, action: &Box<dyn ActionTrait>) -> bool {
+    //fn handle_image_viewer_action(&mut self, cx: &mut Cx, action: &Box<dyn ActionTrait>) -> bool {
+    fn handle_image_viewer_action(&mut self, cx: &mut Cx, action: &Action) -> bool {
+
         match action.downcast_ref() {
             Some(ImageViewerAction::Show(load_state)) => {
                 match load_state {
                     LoadState::Loading(texture, image_size) => {
-                        self.ui.modal(id!(image_viewer)).open(cx);
-                        self.ui.image_viewer(id!(image_viewer_inner)).reset(cx);
-                        self.ui.view(id!(image_viewer_loading_spinner_view)).set_visible(cx, true);
-                        self.ui.label(id!(image_viewer_status_label)).set_text(cx, "Loading...");
-                        self.ui.view(id!(image_viewer_forbidden_view)).set_visible(cx, false);
-                        self.ui.view(id!(footer)).apply_over(cx, live!{
+                        self.ui.modal(ids!(image_viewer)).open(cx);
+                        self.ui.image_viewer(ids!(image_viewer_inner)).reset(cx);
+                        self.ui.view(ids!(image_viewer_loading_spinner_view)).set_visible(cx, true);
+                        self.ui.label(ids!(image_viewer_status_label)).set_text(cx, "Loading...");
+                        self.ui.view(ids!(image_viewer_forbidden_view)).set_visible(cx, false);
+                        self.ui.view(ids!(footer)).apply_over(cx, live!{
                             height: 50
                         });
-                        self.ui.image_viewer(id!(image_viewer_inner)).display_using_texture(cx, texture.as_ref().clone(), image_size);
+                        self.ui.image_viewer(ids!(image_viewer_inner)).display_using_texture(cx, texture.as_ref().clone(), image_size);
                     }
                     LoadState::Loaded(image_bytes) => {
-                        self.ui.modal(id!(image_viewer)).open(cx);
-                        self.ui.image_viewer(id!(image_viewer_inner)).display_using_background_thread(cx, image_bytes);
+                        self.ui.modal(ids!(image_viewer)).open(cx);
+                        self.ui.image_viewer(ids!(image_viewer_inner)).display_using_background_thread(cx, image_bytes);
                     }
                     LoadState::FinishedBackgroundDecoding => {
-                        self.ui.view(id!(zoom_button_view)).set_visible(cx, true);
-                        self.ui.view(id!(image_viewer_loading_spinner_view)).set_visible(cx, false);
-                        self.ui.view(id!(image_viewer_forbidden_view)).set_visible(cx, false);
-                        self.ui.label(id!(image_viewer_status_label)).set_text(cx, "");
+                        self.ui.view(ids!(zoom_button_view)).set_visible(cx, true);
+                        self.ui.view(ids!(image_viewer_loading_spinner_view)).set_visible(cx, false);
+                        self.ui.view(ids!(image_viewer_forbidden_view)).set_visible(cx, false);
+                        self.ui.label(ids!(image_viewer_status_label)).set_text(cx, "");
                         // Collapse the footer
-                        self.ui.view(id!(footer)).apply_over(cx, live!{
+                        self.ui.view(ids!(footer)).apply_over(cx, live!{
                             height: 0
                         });
                     }
                     LoadState::Error(error) => {
-                        if self.ui.modal(id!(image_viewer)).is_open() {
+                        if self.ui.modal(ids!(image_viewer)).is_open() {
                             // Reset the image viewer to clear any previous image
-                            self.ui.view(id!(image_viewer_loading_spinner_view)).set_visible(cx, false);
-                            self.ui.view(id!(image_viewer_forbidden_view)).set_visible(cx, true);
-                            self.ui.label(id!(image_viewer_status_label)).set_text(cx, image_viewer_error_to_string(error));
+                            self.ui.view(ids!(image_viewer_loading_spinner_view)).set_visible(cx, false);
+                            self.ui.view(ids!(image_viewer_forbidden_view)).set_visible(cx, true);
+                            self.ui.label(ids!(image_viewer_status_label)).set_text(cx, image_viewer_error_to_string(error));
                             // Expand the footer
-                            self.ui.view(id!(footer)).apply_over(cx, live!{
+                            self.ui.view(ids!(footer)).apply_over(cx, live!{
                                 height: 50
                             });
                         }
@@ -732,8 +734,8 @@ impl App {
                 true
             }
             Some(ImageViewerAction::Hide) => {
-                self.ui.modal(id!(image_viewer)).close(cx);
-                self.ui.room_image_message_detail(id!(image_detail)).reset_state(cx);
+                self.ui.modal(ids!(image_viewer)).close(cx);
+                self.ui.room_image_message_detail(ids!(image_detail)).reset_state(cx);
                 true
             }
             _ => false

src/app.rs

@@ -270,19 +270,14 @@ impl LinkPreviewRef {
         }
     }
 
+    /// Gets the children of the LinkPreview widget.
     pub fn get_children(&self) -> Vec<ViewRef> {
         if let Some(inner) = self.borrow() {
             return inner.children.clone();
         }
         Vec::new()
     }
-    pub fn iter<F>(&self, closure: F) where F: Fn(&ViewRef) {
-        if let Some(inner) = self.borrow() {
-            for child in inner.children.iter() {
-                closure(child);
-            }
-        }
-    }
+
     /// Shows the collapsible button for the link preview.
     /// 
     /// This function is usually called when the link preview is updated.

src/home/link_preview.rs

@@ -30,38 +30,35 @@ live_design! {
             width: 150, height: Fit,
             flow: Right,
             spacing: 10,
-            margin: {left: 20, top: 20}
-            align: { y: 0.5}
+            margin: {left: 20, top: 40}
+            align: { y: 0.5 }
 
             avatar = <Avatar> {
-                width: 40,
-                height: 40,
+                width: 40, height: 40,
             }
 
             content = <View> {
                 width: Fill, height: Fit,
                 flow: Down,
                 spacing: 4,
-                align: { x: 0.0 }
 
                 username = <Label> {
                     width: Fill, height: Fit,
                     draw_text: {
                         text_style: <REGULAR_TEXT>{font_size: 14},
                         color: (COLOR_TEXT)
                     }
-                    text: ""
                 }
                 timestamp_view = <View> {
                     width: Fill, height: Fit
                     timestamp = <Timestamp> {
                         width: Fill, height: Fit,
-                        margin: { left: 5}
+                        margin: { left: 5 }
                     }
                 }
-                
             }
         }
+
         image_name_and_size = <Label> {
             width: Fill, height: Fit,
             margin: {top: 40}
@@ -72,24 +69,32 @@ live_design! {
                 wrap: Word
             }
         }
+
         empty_right_container = <View> {
             // equal width as the top-left container to keep the image name centered.
             width: 150, height: Fit,
         }
     }
 }
 
+/// A room image message detail widget that displays a user's avatar, username, and message date.
 #[derive(Live, LiveHook, Widget)]
 pub struct RoomImageMessageDetail {
-    #[deref] view: View,    
+    #[deref] view: View,
+    /// The sender of the message
     #[rust] sender: Option<OwnedUserId>,
+    /// The profile of the sender
     #[rust] sender_profile: Option<TimelineDetails<Profile>>,
+    /// The room ID
     #[rust] room_id: Option<OwnedRoomId>,
+    /// The event ID
     #[rust] event_id: Option<OwnedEventId>,
+    /// The sender's avatar has been drawn. Will not be drawn again if set to `true`.
     #[rust] avatar_drawn: bool,
+    /// The name of the image.
     #[rust] image_name: String,
+    /// The size of the image in bytes.
     #[rust] image_size: i32,
-    #[rust] is_desktop: bool
 }
 
 /// Convert bytes to human-readable file size format
@@ -120,14 +125,12 @@ fn format_file_size(bytes: i32) -> String {
     }
 }
 
-/// Maximum image name length for desktop display
-const MAX_IMAGE_NAME_LENGTH_DESKTOP: usize = 50;
-/// Maximum image name length for mobile display
-const MAX_IMAGE_NAME_LENGTH_MOBILE: usize = 10;
+/// Maximum image name length to be displayed
+const MAX_IMAGE_NAME_LENGTH: usize = 50;
 
-/// Truncate image name based on display context while preserving file extension
-fn truncate_image_name(image_name: &str, is_desktop: bool) -> String {
-    let max_length = if is_desktop { MAX_IMAGE_NAME_LENGTH_DESKTOP } else { MAX_IMAGE_NAME_LENGTH_MOBILE };
+/// Truncate image name while preserving file extension
+fn truncate_image_name(image_name: &str) -> String {
+    let max_length = MAX_IMAGE_NAME_LENGTH;
 
     if image_name.len() <= max_length {
         return image_name.to_string();
@@ -159,24 +162,22 @@ impl Widget for RoomImageMessageDetail {
     }
 
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
-        let is_desktop = cx.display_context.is_desktop();
-        if self.is_desktop != is_desktop && !self.image_name.is_empty() {
-            let truncated_name = truncate_image_name(&self.image_name, is_desktop);
-            let human_readable_size = format_file_size(self.image_size);
-            let display_text = format!("{} ({})", truncated_name, human_readable_size);
-            self.label(id!(image_name_and_size)).set_text(cx, &display_text);
-            self.is_desktop = is_desktop;
-        }
-
         if !self.avatar_drawn {
-            let avatar_ref = self.avatar(id!(top_left_container.avatar));
+            let avatar_ref = self.avatar(ids!(top_left_container.avatar));
             let Some(room_id) = &self.room_id else { return DrawStep::done() };
             let Some(sender) = &self.sender else { return DrawStep::done() };
             let (username, avatar_drawn) = avatar_ref.set_avatar_and_get_username(cx, room_id, sender, self.sender_profile.as_ref(), self.event_id.as_deref());
-            self.label(id!(top_left_container.username)).set_text(cx, &username);
+            self.label(ids!(top_left_container.username)).set_text(cx, &username);
             self.avatar_drawn = avatar_drawn;
             let is_desktop = cx.display_context.is_desktop();
-            self.is_desktop = is_desktop;
+            let truncated_name = truncate_image_name(&self.image_name);
+            let human_readable_size = format_file_size(self.image_size);
+            let display_text = format!("{} ({})", truncated_name, human_readable_size);
+            self.label(ids!(image_name_and_size)).set_text(cx, &display_text);
+            let empty_right_container_width = if is_desktop { 150 } else { 0 };
+            self.view(ids!(empty_right_container)).apply_over(cx, live!{
+                width: (empty_right_container_width)
+            });
         }
 
         self.view.draw_walk(cx, scope, walk)
@@ -200,16 +201,15 @@ impl MatchEvent for RoomImageMessageDetail {
             self.event_id = event_id.clone();
             self.avatar_drawn = false;
             // Format and display image name and size
-            let is_desktop = cx.display_context.is_desktop();
-            let truncated_name = truncate_image_name(&image_name, is_desktop);
+            let truncated_name = truncate_image_name(&image_name);
             let human_readable_size = format_file_size(image_size);
             let display_text = format!("{} ({})", truncated_name, human_readable_size);
             self.image_name = image_name;
             self.image_size = image_size;
-            self.label(id!(image_name_and_size)).set_text(cx, &display_text);
+            self.label(ids!(image_name_and_size)).set_text(cx, &display_text);
             if let Some(dt) = unix_time_millis_to_datetime(timestamp_millis) {
-                self.view(id!(timestamp_view)).set_visible(cx, true);
-                self.timestamp(id!(timestamp)).set_date_time(cx, dt);
+                self.view(ids!(timestamp_view)).set_visible(cx, true);
+                self.timestamp(ids!(timestamp)).set_date_time(cx, dt);
             }
         }
     }
@@ -227,9 +227,9 @@ impl RoomImageMessageDetail {
         self.image_size = 0;
 
         // Clear the UI elements
-        self.label(id!(top_left_container.username)).set_text(cx, "");
-        self.label(id!(image_name_and_size)).set_text(cx, "");
-        self.view(id!(timestamp_view)).set_visible(cx, false);
+        self.label(ids!(top_left_container.username)).set_text(cx, "");
+        self.label(ids!(image_name_and_size)).set_text(cx, "");
+        self.view(ids!(timestamp_view)).set_visible(cx, false);
     }
 }
 
@@ -263,4 +263,4 @@ pub enum RoomImageMessageDetailAction {
         image_size: i32
     },
     None,
-}
+}

src/home/room_image_message_detail.rs

@@ -35,7 +35,7 @@ use crate::{
     shared::{
         avatar::AvatarWidgetRefExt, callout_tooltip::TooltipAction, html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt, RobrixHtmlLinkAction}, image_viewer::{ImageViewerAction, ImageViewerError, LoadState}, jump_to_bottom_button::{JumpToBottomButtonWidgetExt, UnreadMessageCount}, popup_list::{PopupItem, PopupKind, enqueue_popup_notification}, restore_status_view::RestoreStatusViewWidgetExt, styles::*, text_or_image::{TextOrImageAction, TextOrImageRef, TextOrImageWidgetRefExt}, timestamp::TimestampWidgetRefExt
     },
-    sliding_sync::{BackwardsPaginateUntilEventRequest, MatrixRequest, PaginationDirection, TimelineEndpoints, TimelineRequestSender, UserPowerLevels, get_client, submit_async_request, take_timeline_endpoints}, utils::{self, ImageFormat, MEDIA_THUMBNAIL_FORMAT, retain_aspect_ratio, room_name_or_id, unix_time_millis_to_datetime}
+    sliding_sync::{BackwardsPaginateUntilEventRequest, MatrixRequest, PaginationDirection, TimelineEndpoints, TimelineRequestSender, UserPowerLevels, get_client, submit_async_request, take_timeline_endpoints}, utils::{self, ImageFormat, MEDIA_THUMBNAIL_FORMAT, constrain_image_dimensions, room_name_or_id, unix_time_millis_to_datetime}
 };
 use crate::home::event_reaction_list::ReactionListWidgetRefExt;
 use crate::home::room_read_receipt::AvatarRowWidgetRefExt;
@@ -662,11 +662,12 @@ impl Widget for RoomScreen {
                         TooltipAction::HoverOut
                     );
                 }
-                let content_message = wr.text_or_image(id!(content.message));
+                let content_message = wr.text_or_image(ids!(content.message));
                 if let TextOrImageAction::Clicked(mxc_uri) = actions.find_widget_action(content_message.widget_uid()).cast() {
                     let Some((texture, size)) = content_message.get_texture_and_size(cx) else { continue; };
-                    let texture = Arc::new(texture);
-                    let (capped_width, capped_height) =  retain_aspect_ratio(size.x as u32, size.y as u32);
+                    let texture = std::rc::Rc::new(texture);
+                    let screen_width = wr.area().rect(cx).size.x;
+                    let (capped_width, capped_height) = constrain_image_dimensions(size.x, size.y, screen_width);
                     if let Some(tl_state) = &mut self.tl_state {
                         if let Some(item) = tl_state.items.get(index) {
                             if let Some(event_tl_item) = item.as_event() {
@@ -682,7 +683,6 @@ impl Widget for RoomScreen {
                                             .and_then(|info| info.size)
                                             .map(|s| i32::try_from(s).unwrap_or_default())
                                             .unwrap_or(0);
-                                        
                                         (name, size)
                                     } else {
                                         ("Unknown Image".to_string(), 0)
@@ -712,15 +712,16 @@ impl Widget for RoomScreen {
                     }
                     continue
                 }
-                let link_preview_content = wr.link_preview(id!(content.link_preview_view)).get_children();
+                let link_preview_content = wr.link_preview(ids!(content.link_preview_view)).get_children();
                 for text_or_image in link_preview_content.iter() {
-                    let text_or_image = text_or_image.text_or_image(id!(image_view.image));
+                    let text_or_image = text_or_image.text_or_image(ids!(image_view.image));
                     if let TextOrImageAction::Clicked(mxc_uri) = actions.find_widget_action(text_or_image.widget_uid()).cast() {
                         let Some((texture, size)) = text_or_image.get_texture_and_size(cx) else { 
                             continue; 
                         };
-                        let (capped_width, capped_height) =  retain_aspect_ratio(size.x as u32, size.y as u32);
-                        let texture = Arc::new(texture);
+                        let screen_width = wr.area().rect(cx).size.x;
+                        let (capped_width, capped_height) = constrain_image_dimensions(size.x, size.y, screen_width);
+                        let texture = std::rc::Rc::new(texture);
                         let Some(mxc_uri_string) = mxc_uri else { continue; };
                         let mxc_uri = OwnedMxcUri::from(mxc_uri_string);
                         cx.action(ImageViewerAction::Show(LoadState::Loading(texture, DVec2 { x: capped_width, y: capped_height })));