Closes #631

Author: dcwhite

src/Interface/Application/ModuleProxyWidget.cc

@@ -149,6 +149,9 @@ void ModuleProxyWidget::showAndColor(const QColor& color)
 
 void ModuleProxyWidget::showAndColorImpl(const QColor& color, int milliseconds)
 {
+  if (timeLine_)
+    return;
+    
   animateColor_ = color;
   timeLine_ = new QTimeLine(milliseconds, this);
   connect(timeLine_, SIGNAL(valueChanged(qreal)), this, SLOT(colorAnimate(qreal)));
@@ -186,7 +189,11 @@ void ModuleProxyWidget::colorAnimate(qreal val)
     }
   }
   else // 1 = done coloring
+  {
     setGraphicsEffect(nullptr);
+    delete timeLine_;
+    timeLine_ = nullptr;
+  }
 }
 
 void ModuleProxyWidget::adjustHeight(int delta)

src/Interface/Application/ModuleWidget.cc

@@ -1281,6 +1281,14 @@ void ModuleWidget::showUI()
     dockable_->show();
 }
 
+void ModuleWidget::collapsePinnedDialog()
+{
+  if (!isViewScene_ && dockable_ && !dockable_->isFloating())
+  {
+    dialog_->collapse();
+  }
+}
+
 void ModuleWidget::executeButtonPushed()
 {
   auto skipUpstream = QApplication::keyboardModifiers() == Qt::ShiftModifier;

src/Interface/Application/ModuleWidget.h

@@ -164,6 +164,7 @@ class ModuleWidget : public QStackedWidget,
 
   QString metadataToString() const;
   QDialog* dialog();
+  void collapsePinnedDialog();
 
   static double highResolutionExpandFactor_;
 

src/Interface/Application/NetworkEditor.cc

@@ -1453,7 +1453,10 @@ void NetworkEditor::restoreAllModuleUIs()
   {
     auto module = getModule(item);
     if (module)
+    {
       module->showUI();
+      module->collapsePinnedDialog();
+    }
   }
 }
 

src/Interface/Modules/Base/ModuleButtonBar.cc

@@ -45,12 +45,15 @@ ModuleButtonBar::ModuleButtonBar(ModuleDialogGeneric* parent) : QWidget(parent)
   executeToolButton_->setIcon(QPixmap(":/general/Resources/new/modules/run_all.png"));
   findToolButton_->setIcon(QPixmap(":/general/Resources/zoom_reset.png"));
   helpToolButton_->setIcon(QPixmap(":/general/Resources/new/modules/help.png"));
+  collapseToolButton_->setIcon(QApplication::style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton));
 
   connect(executeDownOnlyToolButton_, SIGNAL(clicked()), parent->getExecuteDownstreamAction(), SIGNAL(triggered()));
   connect(executeToolButton_, SIGNAL(clicked()), parent->getExecuteAction(), SIGNAL(triggered()));
   connect(closeToolButton_, SIGNAL(clicked()), parent, SIGNAL(closeButtonClicked()));
   connect(helpToolButton_, SIGNAL(clicked()), parent, SIGNAL(helpButtonClicked()));
   connect(findToolButton_, SIGNAL(clicked()), parent, SIGNAL(findButtonClicked()));
+  connect(collapseToolButton_, SIGNAL(clicked()), parent, SLOT(toggleCollapse()));
+  connect(collapseToolButton_, SIGNAL(clicked()), this, SLOT(switchIcons()));
 }
 
 void ModuleButtonBar::setTitle(const QString& title)
@@ -62,3 +65,11 @@ void ModuleButtonBar::setTitleVisible(bool visible)
 {
   titleLabel_->setVisible(visible);
 }
+
+void ModuleButtonBar::switchIcons()
+{
+  //TODO
+  //qDebug() << collapseToolButton_->styleSheet();
+  //collapseToolButton_->setIcon(QApplication::style()->standardIcon(QStyle::SP_TitleBarShadeButton));
+  //collapseToolButton_->setIcon(QApplication::style()->standardIcon(QStyle::SP_TitleBarUnshadeButton));
+}

src/Interface/Modules/Base/ModuleButtonBar.h

@@ -45,6 +45,8 @@ namespace Gui {
     explicit ModuleButtonBar(ModuleDialogGeneric* parent = nullptr);
     void setTitle(const QString& title);
     void setTitleVisible(bool visible);
+  private Q_SLOTS:
+    void switchIcons();
   };
 
 

src/Interface/Modules/Base/ModuleButtonBar.ui

@@ -102,6 +102,13 @@
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QToolButton" name="collapseToolButton_">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QToolButton" name="helpToolButton_">
      <property name="toolTip">

src/Interface/Modules/Base/ModuleDialogGeneric.cc

@@ -240,15 +240,13 @@ void ModuleDialogGeneric::doCollapse()
 {
   if (collapsed_)
   {
-    oldSize_ = size();
+    oldSize_ = dock_->size();
     const int h = std::min(40, oldSize_.height());
     const int w = std::min(400, oldSize_.width());
-    setFixedSize(w, h);
     dock_->setFixedSize(w, h);
   }
   else
   {
-    setFixedSize(oldSize_);
     dock_->setFixedSize(oldSize_);
   }
 }

src/Interface/Modules/Base/ModuleDialogGeneric.h

@@ -92,6 +92,7 @@ namespace Gui {
     virtual void pull() final;
     void moduleSelected(bool selected);
     void toggleCollapse();
+    void collapse() { if (!collapsed_) toggleCollapse(); }
     virtual void updateFromPortChange(int numPorts, const std::string& portName, DynamicPortChange type) {}
   Q_SIGNALS:
     void pullSignal();