From 0d8cefbf2d084053b92ded4785da8083486374ea Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Thu, 23 Apr 2020 15:34:55 -0700
Subject: Add `ImagePane` widget

---
 src/widget.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/widget.rs')

diff --git a/src/widget.rs b/src/widget.rs
index e33a6b2c..a1bc8f5b 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -33,6 +33,12 @@ mod platform {
         pub use iced_winit::image::{Handle, Image};
     }
 
+    #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
+    pub mod image_pane {
+        //! Zoom and pan on an image.
+        pub use iced_wgpu::image_pane::{ImagePane, State};
+    }
+
     #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
     pub mod svg {
         //! Display vector graphics in your user interface.
@@ -44,8 +50,8 @@ mod platform {
     #[doc(no_inline)]
     pub use {
         button::Button, checkbox::Checkbox, container::Container, image::Image,
-        pane_grid::PaneGrid, progress_bar::ProgressBar, radio::Radio,
-        scrollable::Scrollable, slider::Slider, svg::Svg,
+        image_pane::ImagePane, pane_grid::PaneGrid, progress_bar::ProgressBar,
+        radio::Radio, scrollable::Scrollable, slider::Slider, svg::Svg,
         text_input::TextInput,
     };
 
-- 
cgit 


From 431171f975642fe96286f11fb75cd5b06827cc7f Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Fri, 15 May 2020 09:46:22 -0700
Subject: Rename and add to iced image module

---
 src/widget.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/widget.rs')

diff --git a/src/widget.rs b/src/widget.rs
index a1bc8f5b..92303277 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -31,12 +31,7 @@ mod platform {
     pub mod image {
         //! Display images in your user interface.
         pub use iced_winit::image::{Handle, Image};
-    }
-
-    #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
-    pub mod image_pane {
-        //! Zoom and pan on an image.
-        pub use iced_wgpu::image_pane::{ImagePane, State};
+        pub use iced_winit::image_viewer::{ImageViewer, State};
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
@@ -49,9 +44,16 @@ mod platform {
 
     #[doc(no_inline)]
     pub use {
-        button::Button, checkbox::Checkbox, container::Container, image::Image,
-        image_pane::ImagePane, pane_grid::PaneGrid, progress_bar::ProgressBar,
-        radio::Radio, scrollable::Scrollable, slider::Slider, svg::Svg,
+        button::Button,
+        checkbox::Checkbox,
+        container::Container,
+        image::{Image, ImageViewer},
+        pane_grid::PaneGrid,
+        progress_bar::ProgressBar,
+        radio::Radio,
+        scrollable::Scrollable,
+        slider::Slider,
+        svg::Svg,
         text_input::TextInput,
     };
 
-- 
cgit 


From 5d045c2e9a639f8bbf43e68fde9091be702b3ab8 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Tue, 26 May 2020 17:15:55 -0700
Subject: rename to image::Viewer

---
 src/widget.rs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/widget.rs')

diff --git a/src/widget.rs b/src/widget.rs
index 92303277..0b0b25db 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -30,8 +30,7 @@ mod platform {
     #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
     pub mod image {
         //! Display images in your user interface.
-        pub use iced_winit::image::{Handle, Image};
-        pub use iced_winit::image_viewer::{ImageViewer, State};
+        pub use iced_winit::image::{Handle, Image, State, Viewer};
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
@@ -44,16 +43,9 @@ mod platform {
 
     #[doc(no_inline)]
     pub use {
-        button::Button,
-        checkbox::Checkbox,
-        container::Container,
-        image::{Image, ImageViewer},
-        pane_grid::PaneGrid,
-        progress_bar::ProgressBar,
-        radio::Radio,
-        scrollable::Scrollable,
-        slider::Slider,
-        svg::Svg,
+        button::Button, checkbox::Checkbox, container::Container, image::Image,
+        pane_grid::PaneGrid, progress_bar::ProgressBar, radio::Radio,
+        scrollable::Scrollable, slider::Slider, svg::Svg,
         text_input::TextInput,
     };
 
-- 
cgit 


From c7bb43411381a1bffe70ea8e684cd9e4a27739e0 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Wed, 27 May 2020 14:20:07 -0700
Subject: remove re-export on viewer::State

---
 src/widget.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/widget.rs')

diff --git a/src/widget.rs b/src/widget.rs
index 0b0b25db..932a8cf6 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -30,7 +30,9 @@ mod platform {
     #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
     pub mod image {
         //! Display images in your user interface.
-        pub use iced_winit::image::{Handle, Image, State, Viewer};
+        pub use iced_winit::image::{Handle, Image, Viewer};
+
+        pub use iced_winit::image::viewer;
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
-- 
cgit