flag -> bool

GUI/View/Canvas/MaskEditorActions.cpp

@@ -114,21 +114,29 @@ void MaskEditorActions::onToggleMaskValueAction()
 
 void MaskEditorActions::onBringToFrontAction()
 {
-    changeMaskStackingOrder(MaskFlags::BRING_TO_FRONT);
+    changeMaskStackingOrder(true);
 }
 
 void MaskEditorActions::onSendToBackAction()
 {
-    changeMaskStackingOrder(MaskFlags::SEND_TO_BACK);
+    changeMaskStackingOrder(false);
 }
 
 //! Lower mask one level down or rise one level up in the masks stack
-void MaskEditorActions::changeMaskStackingOrder(MaskFlags::Stacking value)
+void MaskEditorActions::changeMaskStackingOrder(bool move_up)
 {
     if (!m_maskContainerModel || !m_selectionModel)
         return;
 
-    if (value == MaskFlags::SEND_TO_BACK) {
+    if (move_up) {
+        QModelIndexList indexes = m_selectionModel->selectedIndexes();
+        for (const QModelIndex& itemIndex : indexes) {
+            int row = itemIndex.row();
+            int new_row = row - 1;
+            if (new_row >= 0 && new_row < m_maskContainerModel->rowCount({}))
+                m_maskContainerModel->moveMask(row, new_row);
+        }
+    } else {
         QModelIndexList indexes = m_selectionModel->selectedIndexes();
         for (const QModelIndex& itemIndex : indexes) {
             int row = itemIndex.row();
@@ -140,15 +148,6 @@ void MaskEditorActions::changeMaskStackingOrder(MaskFlags::Stacking value)
             }
         }
     }
-    if (value == MaskFlags::BRING_TO_FRONT) {
-        QModelIndexList indexes = m_selectionModel->selectedIndexes();
-        for (const QModelIndex& itemIndex : indexes) {
-            int row = itemIndex.row();
-            int new_row = row - 1;
-            if (new_row >= 0 && new_row < m_maskContainerModel->rowCount({}))
-                m_maskContainerModel->moveMask(row, new_row);
-        }
-    }
     gProjectDocument.value()->setModified();
 }
 

GUI/View/Canvas/MaskEditorActions.h

@@ -57,7 +57,7 @@ private slots:
 
 private:
     void initItemContextMenu(QMenu& menu);
-    void changeMaskStackingOrder(MaskFlags::Stacking value);
+    void changeMaskStackingOrder(bool move_up);
     bool isBringToFrontPossible() const;
     bool isSendToBackPossible() const;
     void setAllActionsEnabled(bool value);

GUI/View/Scene/MaskFlags.h

@@ -34,15 +34,11 @@ enum EActivityType {
 };
 Q_DECLARE_FLAGS(Activity, EActivityType)
 
-enum EMoveType { BRING_TO_FRONT, SEND_TO_BACK };
-Q_DECLARE_FLAGS(Stacking, EMoveType)
-
 enum EMaskValue { MASK_OFF, MASK_ON };
 Q_DECLARE_FLAGS(MaskValue, EMaskValue)
 }; // namespace MaskFlags
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskFlags::Activity)
-Q_DECLARE_OPERATORS_FOR_FLAGS(MaskFlags::Stacking)
 Q_DECLARE_OPERATORS_FOR_FLAGS(MaskFlags::MaskValue)
 
 #endif // BORNAGAIN_GUI_VIEW_SCENE_MASKFLAGS_H