gallery slider and user flow

Stehfyn · Sep 10, 2023 · 639915c · 639915c
1 parent b18cb91
commit 639915c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -182,6 +182,17 @@ impl eframe::App for TemplateApp {
                         .clicked()
                     {
                         self.gallery_panel.open = !self.gallery_panel.open;
+                        #[cfg(target_arch = "wasm32")]
+                        if isIOS() || isMobile() {
+                            if self.gallery_panel.open {
+                                self.puzzle_panel.open = false;
+                                self.settings_panel.open = false;
+                                self.about_panel.open = false;
+                            } else {
+                                self.puzzle_panel.open = true;
+                                self.settings_panel.open = true;
+                            }
+                        }
                     }
                     if ui
                         .add_sized(
@@ -194,6 +205,7 @@ impl eframe::App for TemplateApp {
                         .clicked()
                     {
                         self.puzzle_panel.open = true;
+                        self.settings_panel.open = true;
                         self.gallery_panel.open = false;
                         self.about_panel.open = false;
                     }

diff --git a/src/gallery_panel.rs b/src/gallery_panel.rs
@@ -100,6 +100,12 @@ pub struct GalleryPanel {
     random_label: String,
     #[cfg_attr(feature = "serde", serde(skip))]
     gallery_img_width: f32,
+    #[cfg_attr(feature = "serde", serde(skip))]
+    gallery_img_width_min: f32,
+    #[cfg_attr(feature = "serde", serde(skip))]
+    gallery_img_width_max: f32,
+    #[cfg_attr(feature = "serde", serde(skip))]
+    init_slider_bounds: bool,
 }
 
 impl Default for GalleryPanel {
@@ -121,6 +127,9 @@ impl Default for GalleryPanel {
             upload_label: "Upload Image".to_owned(),
             random_label: "Random Image".to_owned(),
             gallery_img_width: 146.,
+            gallery_img_width_min: 146.,
+            gallery_img_width_max: 146.,
+            init_slider_bounds: false,
         }
     }
 }
@@ -405,7 +414,10 @@ impl GalleryPanel {
             ui.add(
                 egui::Slider::new(
                     &mut self.gallery_img_width,
-                    std::ops::RangeInclusive::new(50., 400.),
+                    std::ops::RangeInclusive::new(
+                        self.gallery_img_width_min,
+                        self.gallery_img_width_max,
+                    ),
                 )
                 .show_value(false)
                 .trailing_fill(true),
@@ -419,7 +431,23 @@ impl GalleryPanel {
             - (ui.ctx().style().spacing.item_spacing.x * 2.)
             - ui.ctx().style().spacing.scroll_bar_width;
         let mut bid = ui.next_auto_id();
-
+        let w_for_3 = (ui.available_width() / 3.)
+            - ui.ctx().style().spacing.button_padding.x
+            - ui.ctx().style().spacing.item_spacing.x
+            - ui.ctx().style().spacing.window_margin.right;
+        //- ui.ctx().style().spacing.;
+        self.gallery_img_width_min = w_for_3;
+        let w_for_1 = ui.available_width()
+            - ui.ctx().style().spacing.button_padding.x
+            - ui.ctx().style().spacing.item_spacing.x
+            - ui.ctx().style().spacing.item_spacing.x
+            - ui.ctx().style().spacing.scroll_bar_width
+            - ui.ctx().style().spacing.window_margin.right;
+        self.gallery_img_width_max = w_for_1;
+        if !self.init_slider_bounds {
+            self.gallery_img_width = self.gallery_img_width_min;
+            self.init_slider_bounds = true;
+        }
         egui::ScrollArea::new([false, true])
             .auto_shrink([false, false])
             .max_width(ui.available_width())
@@ -428,6 +456,7 @@ impl GalleryPanel {
             .show(ui, |ui| {
                 egui::Grid::new("neato").show(ui, |ui| {
                     let mut row_w_accum = 0.;
+
                     for (i, img) in self.img.iter_mut().enumerate() {
                         if let Some((texture_id, size)) = texture_ids_and_sizes.get(i) {
                             let _bid = ui.next_auto_id();