[niepce] Scoped enum for the ZoomeMode.



commit cbcdc02aa557a326e900544c0e2b80b7070e8206
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Jun 19 23:24:16 2015 -0400

    Scoped enum for the ZoomeMode.

 src/niepce/modules/darkroom/imagecanvas.cpp |    6 +++---
 src/niepce/modules/darkroom/imagecanvas.hpp |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/niepce/modules/darkroom/imagecanvas.cpp b/src/niepce/modules/darkroom/imagecanvas.cpp
index 6f33ec9..0da1d3e 100644
--- a/src/niepce/modules/darkroom/imagecanvas.cpp
+++ b/src/niepce/modules/darkroom/imagecanvas.cpp
@@ -41,7 +41,7 @@ namespace dr {
 ImageCanvas::ImageCanvas()
     : m_need_redisplay(true),
       m_resized(false),
-      m_zoom_mode(ZOOM_MODE_FIT)
+      m_zoom_mode(ZoomMode::FIT)
 {
 }
 
@@ -219,10 +219,10 @@ void ImageCanvas::_redisplay()
     fwk::Rect frame;
     switch(m_zoom_mode)
     {
-    case ZOOM_MODE_FIT:
+    case ZoomMode::FIT:
         frame = source.fit_into(dest);
         break;
-    case ZOOM_MODE_FILL:
+    case ZoomMode::FILL:
         frame = source.fill_into(dest);
         break;
     default:
diff --git a/src/niepce/modules/darkroom/imagecanvas.hpp b/src/niepce/modules/darkroom/imagecanvas.hpp
index 624c25e..12405e6 100644
--- a/src/niepce/modules/darkroom/imagecanvas.hpp
+++ b/src/niepce/modules/darkroom/imagecanvas.hpp
@@ -32,13 +32,13 @@ class ImageCanvas
     : public Gtk::DrawingArea
 {
 public:
-    typedef enum {
-        ZOOM_MODE_NONE = 0,
-        ZOOM_MODE_FIT,
-        ZOOM_MODE_FILL,
-        ZOOM_MODE_100P,
-        ZOOM_MODE_CUSTOM
-    } ZoomMode;
+    enum class ZoomMode {
+        NONE = 0,
+        FIT,
+        FILL,
+        ONE_ONE, // 100%
+        CUSTOM
+    };
     ImageCanvas();
 
     void set_image(const ncr::Image::Ptr & img);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]