restore visibility after applying masks

GUI/Model/Data/MaskItems.cpp

@@ -265,6 +265,7 @@ void MaskItem::readFrom(QXmlStreamReader* r)
             // is visible?
         } else if (tag == Tag::IsVisible) {
             XML::readAttribute(r, XML::Attrib::value, &m_isVisible);
+            m_wasVisible = m_isVisible;
             XML::gotoEndElementOfTag(r, tag);
 
         } else

GUI/Model/Data/MaskItems.h

@@ -54,6 +54,9 @@ public:
     bool isVisibleValue() const;
     void setIsVisibleValue(bool visible);
 
+    bool wasVisible() const { return m_wasVisible; }
+    void setWasVisible(bool v) { m_wasVisible = v; }
+
     virtual void writeTo(QXmlStreamWriter* w) const;
     virtual void readFrom(QXmlStreamReader* r);
 
@@ -62,6 +65,7 @@ protected:
     QString m_maskName = "nameless by default";
     bool m_maskValue = true;
     bool m_isVisible = true;
+    bool m_wasVisible = m_isVisible; // do not serialize
 };
 
 class RectangleItem : public MaskItem {

GUI/View/Mask/MaskEditorCanvas.cpp

@@ -82,9 +82,9 @@ void MaskEditorCanvas::onPresentationTypeRequest(MaskEditorFlags::PresentationTy
     m_resultsPresenter->updatePresenter(presentationType);
 
     if (auto* container = m_intensityDataItem->maskContainerItem()) {
-        bool isVisible = presentationType.testFlag(MaskEditorFlags::MASK_EDITOR);
+        bool tempVisible = presentationType.testFlag(MaskEditorFlags::MASK_EDITOR);
         for (MaskItem* mask : container->maskItems())
-            mask->setIsVisibleValue(isVisible);
+            mask->setIsVisibleValue(tempVisible && mask->wasVisible());
     }
 }
 

GUI/View/Mask/MaskEditorPropertyPanel.cpp

@@ -181,6 +181,7 @@ void MaskEditorPropertyPanel::createMaskEditorUI()
     const auto visibilityValueSetter = [this, maskItem](bool b) {
         m_inhibitSelectionChange = true;
         maskItem->setIsVisibleValue(b);
+        maskItem->setWasVisible(b);
         m_inhibitSelectionChange = false;
     };
     addMaskCheckBox("Show", visibilityValueGetter, visibilityValueSetter);