Remove unwanted

Author: alanpoon

src/shared/image_viewer.rs

@@ -1,7 +1,7 @@
 //! Image viewer widget for displaying Image with zooming and panning.
 //!
 //! There are 2 types of ImageViewerActions handled by this widget. They are "Show" and "Hide".
-//! ImageViewerRef has 3 public methods, `display_using_background_thread`, `display_using_texture` and `reset`.
+//! ImageViewerRef has 4 public methods, `configure_zoom`, `display_using_background_thread`, `display_using_texture` and `reset`.
 use std::sync::{Arc, mpsc::Receiver};
 
 use makepad_widgets::{event::TouchUpdateEvent, image_cache::{ImageBuffer, ImageError}, rotated_image::RotatedImageWidgetExt, *};
@@ -110,7 +110,7 @@ live_design! {
             width: Fill, height: Fill,
             align: { x: 0.4, y: 0.35 }
 
-            magnify_glass_sign = <Label> {
+            magnifying_glass_sign = <Label> {
                 text: "+",
                 draw_text: {
                     text_style: <THEME_FONT_BOLD>{font_size: 15},
@@ -154,7 +154,7 @@ live_design! {
                     width: Fill, height: Fill,
                     align: { x: 0.4, y: 0.35 }
 
-                    magnify_glass_sign = <Label> {
+                    magnifying_glass_sign = <Label> {
                         text: "-",
                         draw_text: {
                             text_style: <THEME_FONT_BOLD>{font_size: 15},
@@ -657,9 +657,18 @@ impl ImageViewer {
     }
 
     /// Handle touch update events, specifically the pinch gesture to zoom in/out.
-    /// When the event contains two touches, the distance between the two touches is used to calculate a scale factor.
-    /// The scale factor is then passed to `adjust_zoom` to adjust the zoom level of the image viewer.
-    /// When the event contains less than two touches, the previous pinch distance is reset to `None`.
+    /// 
+    /// This method implements pinch-to-zoom functionality by:
+    /// 1. Detecting when exactly two touch points are present
+    /// 2. Calculating the current distance between the two touch points
+    /// 3. Comparing it to the previous distance to determine the scale factor
+    /// 4. Applying the scale factor to adjust the zoom level
+    /// 5. Resetting the pinch tracking when fewer than two touches are detected
+    /// 
+    /// When the event contains two touches, the distance between the two touches is used 
+    /// to calculate a scale factor. The scale factor is then passed to `adjust_zoom` to 
+    /// adjust the zoom level of the image viewer. When the event contains less than two 
+    /// touches, the previous pinch distance is reset to `None`.
     fn handle_touch_update(&mut self, cx: &mut Cx, event: &TouchUpdateEvent) {
         if event.touches.len() == 2 {
             let touch1 = &event.touches[0];

src/utils.rs

@@ -14,9 +14,6 @@ use crate::{room::FetchedRoomAvatar, shared::image_viewer::ImageViewerError, sli
 /// The scheme for GEO links, used for location messages in Matrix.
 pub const GEO_URI_SCHEME: &str = "geo:";
 
-/// The max size (width or height) of a rotated image to display.
-const ROTATED_IMAGE_MAX_SIZE: u32 = 500;
-
 /// A wrapper type that implements the `Debug` trait for non-`Debug` types.
 pub struct DebugWrapper<T>(T);
 impl<T> std::fmt::Debug for DebugWrapper<T> {
@@ -138,6 +135,24 @@ pub fn load_png_or_jpg(img: &ImageRef, cx: &mut Cx, data: &[u8]) -> Result<(), I
 }
 
 /// Constrain the width and height of an image to the screen_width, while preserving aspect ratio.
+/// 
+/// This function implements an intelligent scaling algorithm that handles three scenarios:
+/// 1. If both dimensions are within `screen_width`: enlarges the image so height equals `screen_width`
+/// 2. If height exceeds limit: scales down to fit height within `screen_width`
+/// 3. If width exceeds limit: scales down to fit width within `screen_width`
+/// 
+/// The aspect ratio is always preserved during scaling operations to prevent image distortion.
+/// 
+/// # Algorithm Details
+/// The function first checks if the image fits within the screen dimensions. If not, it calculates
+/// scaling factors for both width and height constraints and applies the more restrictive one.
+/// After applying the first constraint, it checks if the other dimension still exceeds the limit
+/// and applies a second scaling if necessary.
+///
+/// # Parameters
+/// - `width`: Original image width in pixels
+/// - `height`: Original image height in pixels  
+/// - `screen_width`: Maximum allowed dimension for both width and height
 ///
 /// # Returns
 /// A tuple of (constrained_width, constrained_height) as f64 values