From 92c019dad798f1a84c5d3e8e8331a885f6458133 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 5 May 2015 19:09:02 +0300
Subject: Add to left classes stong typed Modal enum.

---
 src/gui/widgets/dropdown.cpp  | 2 +-
 src/gui/widgets/dropdown.h    | 4 +++-
 src/gui/widgets/popuplist.cpp | 9 +++++----
 src/gui/widgets/popuplist.h   | 9 ++++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 3977931b6..a4afdb6d1 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -54,7 +54,7 @@ static std::string const dropdownFiles[2] =
 DropDown::DropDown(const Widget2 *const widget,
                    ListModel *const listModel,
                    const bool extended,
-                   const bool modal,
+                   const Modal modal,
                    ActionListener *const listener,
                    const std::string &eventId) :
     ActionListener(),
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index ee1fc2789..391a49873 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -23,6 +23,8 @@
 #ifndef GUI_WIDGETS_DROPDOWN_H
 #define GUI_WIDGETS_DROPDOWN_H
 
+#include "enums/simpletypes.h"
+
 #include "gui/widgets/basiccontainer.h"
 
 #include "listeners/actionlistener.h"
@@ -64,7 +66,7 @@ class DropDown final : public ActionListener,
         DropDown(const Widget2 *const widget,
                  ListModel *const listModel,
                  const bool extended = false,
-                 const bool modal = false,
+                 const Modal modal = Modal_false,
                  ActionListener *const listener = nullptr,
                  const std::string &eventId = "");
 
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index e695c734b..c459fe351 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -30,7 +30,8 @@
 
 PopupList::PopupList(DropDown *const widget,
                      ListModel *const listModel,
-                     bool extended, bool modal) :
+                     const bool extended,
+                     const Modal modal) :
     Popup("PopupList", "popuplist.xml"),
     FocusListener(),
     mListModel(listModel),
@@ -88,7 +89,7 @@ void PopupList::show(int x, int y)
     setPosition(x, y);
     setVisible(true);
     requestMoveToTop();
-    if (mModal)
+    if (mModal == Modal_true)
         requestModalFocus();
 }
 
@@ -153,7 +154,7 @@ void PopupList::mouseReleased(MouseEvent& event)
     if (mDropDown)
         mDropDown->updateSelection();
     setVisible(false);
-    if (mModal)
+    if (mModal == Modal_true)
         releaseModalFocus();
 }
 
@@ -169,7 +170,7 @@ void PopupList::focusGained(const Event& event)
     if (mDropDown)
         mDropDown->updateSelection();
     setVisible(false);
-    if (mModal)
+    if (mModal == Modal_true)
         releaseModalFocus();
 }
 
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index db38585d9..a15701d57 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -21,6 +21,8 @@
 #ifndef GUI_WIDGETS_POPUPLIST_H
 #define GUI_WIDGETS_POPUPLIST_H
 
+#include "enums/simpletypes.h"
+
 #include "gui/widgets/popup.h"
 
 #include "listeners/focuslistener.h"
@@ -37,8 +39,9 @@ class PopupList final : public Popup,
 {
     public:
         PopupList(DropDown *const widget,
-                  ListModel *const listModel, bool extended,
-                  bool modal = false);
+                  ListModel *const listModel,
+                  const bool extended,
+                  const Modal modal = Modal_false);
 
         ~PopupList();
 
@@ -75,7 +78,7 @@ class PopupList final : public Popup,
         ScrollArea *mScrollArea;
         DropDown *mDropDown;
         int mPressedIndex;
-        bool mModal;
+        Modal mModal;
 };
 
 #endif  // GUI_WIDGETS_POPUPLIST_H
-- 
cgit v1.2.3-70-g09d2