Merge branch 'show_meta_data' into sort_by_metadata

Author: hacknus

examples/README.md

@@ -79,6 +79,7 @@ cargo run --example save_file
 
 
 ## Pick File with Information View
+
 Example showing how to pick a file and display file information using the `InformationView`.
 
 Requires the feature `information_view` as well as these dependencies:
@@ -92,7 +93,7 @@ image = { version = "0.25.5", features = ["bmp", "jpeg", "gif", "png", "tiff", "
 ```
 
 ```shell
-cargo run --example select_file_with_information_view
+cargo run --example pick_file_with_information_view
 ```
 
 ![Screenshot](../media/examples/information_view.png)

…les/select_file_with_information_view.rs …mples/pick_file_with_information_view.rsexamples/select_file_with_information_view.rs renamed to examples/pick_file_with_information_view.rs examples/select_file_with_information_view.rs renamed to examples/pick_file_with_information_view.rs

@@ -1239,6 +1239,11 @@ impl FileDialog {
     pub fn state(&self) -> DialogState {
         self.state.clone()
     }
+
+    /// Get the window Id
+    pub const fn get_window_id(&self) -> egui::Id {
+        self.window_id
+    }
 }
 
 /// UI methods

src/file_dialog.rs

@@ -3,7 +3,7 @@
 use crate::{DirectoryEntry, FileDialog};
 use chrono::{DateTime, Local};
 use egui::ahash::{HashMap, HashMapExt};
-use egui::Ui;
+use egui::{Direction, Layout, Ui, Vec2};
 use indexmap::{IndexMap, IndexSet};
 use std::fs::File;
 use std::io::{self, Read};
@@ -139,47 +139,23 @@ impl Default for InformationPanel {
             "jpg".to_string(),
             Box::new(
                 |ui: &mut Ui, item: &InfoPanelEntry, stored_images: &mut IndexSet<String>| {
-                    ui.label("Image");
-                    stored_images.insert(format!("{}", item.directory_entry.as_path().display()));
-                    let image = egui::Image::new(format!(
-                        "file://{}",
-                        item.directory_entry.as_path().display()
-                    ));
-                    ui.vertical_centered(|ui| {
-                        ui.add(image.max_height(ui.available_width()));
-                    });
+                    Self::show_image_preview(ui, item, stored_images);
                 },
             ) as Box<dyn FnMut(&mut Ui, &InfoPanelEntry, &mut IndexSet<String>)>,
         );
         supported_images.insert(
             "jpeg".to_string(),
             Box::new(
                 |ui: &mut Ui, item: &InfoPanelEntry, stored_images: &mut IndexSet<String>| {
-                    ui.label("Image");
-                    stored_images.insert(format!("{}", item.directory_entry.as_path().display()));
-                    let image = egui::Image::new(format!(
-                        "file://{}",
-                        item.directory_entry.as_path().display()
-                    ));
-                    ui.vertical_centered(|ui| {
-                        ui.add(image.max_height(ui.available_width()));
-                    });
+                    Self::show_image_preview(ui, item, stored_images);
                 },
             ) as Box<dyn FnMut(&mut Ui, &InfoPanelEntry, &mut IndexSet<String>)>,
         );
         supported_images.insert(
             "png".to_string(),
             Box::new(
                 |ui: &mut Ui, item: &InfoPanelEntry, stored_images: &mut IndexSet<String>| {
-                    ui.label("Image");
-                    stored_images.insert(format!("{}", item.directory_entry.as_path().display()));
-                    let image = egui::Image::new(format!(
-                        "file://{}",
-                        item.directory_entry.as_path().display()
-                    ));
-                    ui.vertical_centered(|ui| {
-                        ui.add(image.max_height(ui.available_width()));
-                    });
+                    Self::show_image_preview(ui, item, stored_images);
                 },
             ) as Box<dyn FnMut(&mut Ui, &InfoPanelEntry, &mut IndexSet<String>)>,
         );
@@ -199,6 +175,30 @@ impl Default for InformationPanel {
 }
 
 impl InformationPanel {
+    fn show_image_preview(
+        ui: &mut Ui,
+        item: &InfoPanelEntry,
+        stored_images: &mut IndexSet<String>,
+    ) {
+        ui.label("Image");
+        stored_images.insert(format!("{}", item.directory_entry.as_path().display()));
+        let image = egui::Image::new(format!(
+            "file://{}",
+            item.directory_entry.as_path().display()
+        ));
+        let size = Vec2 {
+            x: ui.available_width(),
+            y: ui.available_width() / 4.0 * 3.0,
+        };
+        ui.allocate_ui_with_layout(
+            size,
+            Layout::centered_and_justified(Direction::TopDown),
+            |ui| {
+                ui.add(image);
+            },
+        );
+    }
+
     /// Adds support for previewing a custom file type.
     ///
     /// # Arguments
@@ -294,15 +294,15 @@ impl InformationPanel {
             ui.add_space(spacing);
 
             // show all metadata
-            self.display_meta_data(ui, width, item);
+            self.display_meta_data(ui, file_dialog.get_window_id(), width, item);
         }
     }
 
     fn display_preview(&mut self, ui: &mut Ui, item: &DirectoryEntry) {
         if item.is_dir() {
             // show folder icon
             ui.vertical_centered(|ui| {
-                ui.label(egui::RichText::from(item.icon()).size(120.0));
+                ui.label(egui::RichText::from(item.icon()).size(ui.available_width() / 3.0));
             });
         } else {
             // Display file content preview based on its extension
@@ -322,21 +322,23 @@ impl InformationPanel {
                         }
                     } else if let Some(mut content) = panel_entry.content() {
                         egui::ScrollArea::vertical()
-                            .max_height(100.0)
+                            .max_height(ui.available_width() / 3.0)
                             .show(ui, |ui| {
                                 ui.add(egui::TextEdit::multiline(&mut content).code_editor());
                             });
                     } else {
                         // if now preview is available, show icon
                         ui.vertical_centered(|ui| {
-                            ui.label(egui::RichText::from(item.icon()).size(120.0));
+                            ui.label(
+                                egui::RichText::from(item.icon()).size(ui.available_width() / 3.0),
+                            );
                         });
                     }
                 }
             } else {
                 // if now ext is available, show icon anyway
                 ui.vertical_centered(|ui| {
-                    ui.label(egui::RichText::from(item.icon()).size(120.0));
+                    ui.label(egui::RichText::from(item.icon()).size(ui.available_width() / 3.0));
                 });
             }
         }
@@ -383,11 +385,11 @@ impl InformationPanel {
         }
     }
 
-    fn display_meta_data(&self, ui: &mut Ui, width: f32, item: &DirectoryEntry) {
+    fn display_meta_data(&self, ui: &mut Ui, id: egui::Id, width: f32, item: &DirectoryEntry) {
         egui::ScrollArea::vertical()
-            .id_salt("meta_data_scroll")
+            .id_salt(id.with("meta_data_scroll"))
             .show(ui, |ui| {
-                egui::Grid::new("meta_data")
+                egui::Grid::new(id.with("meta_data_grid"))
                     .num_columns(2)
                     .striped(true)
                     .min_col_width(width)