Hide viewer buttons when roto/tracker properties panel is minimized

Documentation/source/conf.py

@@ -53,7 +53,7 @@
 version_22 = '2.2.10'
 version_23 = '2.3.16'
 version_24 = '2.4.3'
-version_24 = '2.5.0'
+version_25 = '2.5.0'
 version_30 = '3.0.0'
 
 # The version for this branch

Gui/NodeGui.cpp

@@ -434,6 +434,8 @@ NodeGui::ensurePanelCreated(bool minimized, bool hideUnmodified)
     if (_settingsPanel) {
         QObject::connect( _settingsPanel, SIGNAL(nameChanged(QString)), this, SLOT(setName(QString)) );
         QObject::connect( _settingsPanel, SIGNAL(closeChanged(bool)), this, SLOT(onSettingsPanelClosed(bool)) );
+        QObject::connect( _settingsPanel, SIGNAL(minimized()), this, SLOT(onSettingsPanelMinimized()) );
+        QObject::connect( _settingsPanel, SIGNAL(maximized()), this, SLOT(onSettingsPanelMaximized()) );
         QObject::connect( _settingsPanel, SIGNAL(colorChanged(QColor)), this, SLOT(onSettingsPanelColorChanged(QColor)) );
 
         _graph->getGui()->setNodeViewerInterface(thisShared);
@@ -497,6 +499,32 @@ NodeGui::onSettingsPanelClosed(bool closed)
     Q_EMIT settingsPanelClosed(closed);
 }
 
+void
+NodeGui::onSettingsPanelMinimized()
+{
+    NodePtr internalNode = getNode();
+    if (internalNode && internalNode->hasAnyPersistentMessage()) {
+        const std::list<ViewerTab*>& viewers = getDagGui()->getGui()->getViewersList();
+        for (std::list<ViewerTab*>::const_iterator it = viewers.begin(); it != viewers.end(); ++it) {
+            (*it)->getViewer()->updatePersistentMessage();
+        }
+    }
+    Q_EMIT settingsPanelMinimized();
+}
+
+void
+NodeGui::onSettingsPanelMaximized()
+{
+    NodePtr internalNode = getNode();
+    if (internalNode && internalNode->hasAnyPersistentMessage()) {
+        const std::list<ViewerTab*>& viewers = getDagGui()->getGui()->getViewersList();
+        for (std::list<ViewerTab*>::const_iterator it = viewers.begin(); it != viewers.end(); ++it) {
+            (*it)->getViewer()->updatePersistentMessage();
+        }
+    }
+    Q_EMIT settingsPanelMaximized();
+}
+
 NodeSettingsPanel*
 NodeGui::createPanel(QVBoxLayout* container,
                      const NodeGuiPtr& thisAsShared)
@@ -2102,23 +2130,23 @@ NodeGui::setVisibleSettingsPanel(bool b, bool m, bool h)
     }
     if (_settingsPanel) {
         _settingsPanel->setClosed(!b);
+        if (b) {
+            // also maximize (but don't minimize when closing)
+            _settingsPanel->minimizeOrMaximize(false);
+        }
     }
 }
 
 bool
 NodeGui::isSettingsPanelVisible() const
 {
-    if (_settingsPanel) {
-        return !_settingsPanel->isClosed();
-    } else {
-        return false;
-    }
+    return _settingsPanel && !_settingsPanel->isClosed() && !_settingsPanel->isMinimized();
 }
 
 bool
 NodeGui::isSettingsPanelMinimized() const
 {
-    return _settingsPanel ? _settingsPanel->isMinimized() : false;
+    return _settingsPanel && _settingsPanel->isMinimized();
 }
 
 void

Gui/NodeGui.h

@@ -453,6 +453,10 @@ public Q_SLOTS:
 
     void onSettingsPanelClosed(bool closed);
 
+    void onSettingsPanelMinimized();
+
+    void onSettingsPanelMaximized();
+
     void onSettingsPanelColorChanged(const QColor & color);
 
     void togglePreview();
@@ -543,6 +547,10 @@ public Q_SLOTS:
 
     void settingsPanelClosed(bool b);
 
+    void settingsPanelMinimized();
+
+    void settingsPanelMaximized();
+
     void previewImageComputed();
 
 protected:

Gui/NodeViewerContext.cpp

@@ -159,6 +159,8 @@ NodeViewerContext::createGui()
     QObject::connect( _imp->viewer, SIGNAL(selectionCleared()), this, SLOT(onViewerSelectionCleared()), Qt::UniqueConnection );
     NodeGuiPtr node = _imp->getNode();
     QObject::connect( node.get(), SIGNAL(settingsPanelClosed(bool)), this, SLOT(onNodeSettingsPanelClosed(bool)), Qt::UniqueConnection );
+    QObject::connect( node.get(), SIGNAL(settingsPanelMinimized()), this, SLOT(onNodeSettingsPanelMinimized()), Qt::UniqueConnection );
+    QObject::connect( node.get(), SIGNAL(settingsPanelMaximized()), this, SLOT(onNodeSettingsPanelMaximized()), Qt::UniqueConnection );
     KnobsVec knobsOrdered = node->getNode()->getEffectInstance()->getViewerUIKnobs();
 
 
@@ -268,6 +270,18 @@ NodeViewerContext::onNodeSettingsPanelClosed(bool closed)
     }
 }
 
+void
+NodeViewerContext::onNodeSettingsPanelMinimized()
+{
+    return onNodeSettingsPanelClosed(true);
+}
+
+void
+NodeViewerContext::onNodeSettingsPanelMaximized()
+{
+    return onNodeSettingsPanelClosed(false);
+}
+
 int
 NodeViewerContext::getItemsSpacingOnSameLine() const
 {

Gui/NodeViewerContext.h

@@ -138,6 +138,10 @@ public Q_SLOTS:
 
     void onNodeSettingsPanelClosed(bool closed);
 
+    void onNodeSettingsPanelMinimized();
+
+    void onNodeSettingsPanelMaximized();
+
 private:
 
     boost::scoped_ptr<NodeViewerContextPrivate> _imp;