Merge branch 'openscad:master' into master

Author: gsohler

src/gui/Animate.cc

@@ -28,23 +28,23 @@ Animate::Animate(QWidget *parent) : QWidget(parent)
   const auto scrollMargins = scrollAreaWidgetContents->layout()->contentsMargins();
   const auto parameterMargins = groupBoxParameter->layout()->contentsMargins();
   initMinWidth = width + margins.left() + margins.right() + scrollMargins.left() + scrollMargins.right()
-  +parameterMargins.left() + parameterMargins.right();
+    + parameterMargins.left() + parameterMargins.right();
 }
 
 void Animate::initGUI()
 {
-    this->animStep = 0;
-    this->animNumSteps = 0;
+  this->animStep = 0;
+  this->animNumSteps = 0;
   this->animTVal = 0.0;
-    this->animDumping = false;
+  this->animDumping = false;
   this->animDumpStartStep = 0;
 
   this->iconRun = QIcon::fromTheme("chokusen-animate-play");
   this->iconPause = QIcon::fromTheme("chokusen-animate-pause");
   this->iconDisabled = QIcon::fromTheme("chokusen-animate-disabled");
 
-    animateTimer = new QTimer(this);
-    connect(animateTimer, SIGNAL(timeout()), this, SLOT(incrementTVal()));
+  animateTimer = new QTimer(this);
+  connect(animateTimer, SIGNAL(timeout()), this, SLOT(incrementTVal()));
 
   connect(this->e_tval, SIGNAL(textChanged(QString)), this, SLOT(updatedAnimTval()));
   connect(this->e_fps, SIGNAL(textChanged(QString)), this, SLOT(updatedAnimFpsAndAnimSteps()));
@@ -72,9 +72,9 @@ void Animate::connectAction(QAction *action, QPushButton *button)
 
 void Animate::updatedAnimTval()
 {
-    double t = this->e_tval->text().toDouble(&this->tOK);
+  double t = this->e_tval->text().toDouble(&this->tOK);
   // Clamp t to 0-1
-    if (this->tOK) {
+  if (this->tOK) {
     t = t < 0 ? 0.0 : ((t > 1.0) ? 1.0 : t);
   } else {
     t = 0.0;
@@ -88,23 +88,23 @@ void Animate::updatedAnimTval()
 
 void Animate::updatedAnimFpsAndAnimSteps()
 {
-    animateTimer->stop();
+  animateTimer->stop();
 
   int numsteps = this->e_fsteps->text().toInt(&this->steps_ok);
   if (this->steps_ok) {
-      this->animNumSteps = numsteps;
+    this->animNumSteps = numsteps;
   } else {
-      this->animNumSteps = 0;
+    this->animNumSteps = 0;
   }
   this->animDumping = false;
 
   double fps = this->e_fps->text().toDouble(&this->fpsOK);
   animateTimer->stop();
   if (this->fpsOK && fps > 0 && this->animNumSteps > 0) {
-      this->animStep = int(this->animTVal * this->animNumSteps) % this->animNumSteps;
-      animateTimer->setSingleShot(false);
-      animateTimer->setInterval(int(1000 / fps));
-      animateTimer->start();
+    this->animStep = int(this->animTVal * this->animNumSteps) % this->animNumSteps;
+    animateTimer->setSingleShot(false);
+    animateTimer->setInterval(int(1000 / fps));
+    animateTimer->start();
   }
 
   QPalette defaultPalette;
@@ -129,25 +129,25 @@ void Animate::updatedAnimFpsAndAnimSteps()
 
 void Animate::updatedAnimDump(bool checked)
 {
-    if (!checked) this->animDumping = false;
+  if (!checked) this->animDumping = false;
 
   updatePauseButtonIcon();
 }
 
 // Only called from animate_timer
 void Animate::incrementTVal()
 {
-    if (this->animNumSteps == 0) return;
+  if (this->animNumSteps == 0) return;
 
-  if (mainWindow->windowActionHideCustomizer->isVisible()) {
+  if (mainWindow->parameterDock->isVisible()) {
     if (mainWindow->activeEditor->parameterWidget->childHasFocus()) return;
   }
 
   if (this->animNumSteps > 1) {
-      this->animStep = (this->animStep + 1) % this->animNumSteps;
-      this->animTVal = 1.0 * this->animStep / this->animNumSteps;
+    this->animStep = (this->animStep + 1) % this->animNumSteps;
+    this->animTVal = 1.0 * this->animStep / this->animNumSteps;
   } else if (this->animNumSteps > 0) {
-      this->animStep = 0;
+    this->animStep = 0;
     this->animTVal = 0.0;
   }
 
@@ -159,17 +159,17 @@ void Animate::incrementTVal()
 
 void Animate::updateTVal()
 {
-    if (this->animNumSteps == 0) return;
+  if (this->animNumSteps == 0) return;
 
   if (this->animStep < 0) {
-      this->animStep = this->animNumSteps - this->animStep - 2;
+    this->animStep = this->animNumSteps - this->animStep - 2;
   }
 
   if (this->animNumSteps > 1) {
-      this->animStep = (this->animStep) % this->animNumSteps;
-      this->animTVal = 1.0 * this->animStep / this->animNumSteps;
+    this->animStep = (this->animStep) % this->animNumSteps;
+    this->animTVal = 1.0 * this->animStep / this->animNumSteps;
   } else if (this->animNumSteps > 0) {
-      this->animStep = 0;
+    this->animStep = 0;
     this->animTVal = 0.0;
   }
 
@@ -180,14 +180,14 @@ void Animate::updateTVal()
 }
 
 void Animate::pauseAnimation(){
-    animateTimer->stop();
+  animateTimer->stop();
   updatePauseButtonIcon();
 }
 
 void Animate::on_pauseButton_pressed()
 {
-    if (animateTimer->isActive()) {
-        animateTimer->stop();
+  if (animateTimer->isActive()) {
+    animateTimer->stop();
     updatePauseButtonIcon();
   } else {
     this->updatedAnimFpsAndAnimSteps();
@@ -196,7 +196,7 @@ void Animate::on_pauseButton_pressed()
 
 void Animate::updatePauseButtonIcon()
 {
-    if (animateTimer->isActive()) {
+  if (animateTimer->isActive()) {
     pauseButton->setIcon(this->iconPause);
     pauseButton->setToolTip(_("press to pause animation") );
   } else {
@@ -223,29 +223,29 @@ void Animate::animateUpdate()
   if (mainWindow->animateDockContents->isVisible()) {
     double fps = this->e_fps->text().toDouble(&this->fpsOK);
     if (this->fpsOK && fps <= 0 && !animateTimer->isActive()) {
-        animateTimer->stop();
-        animateTimer->setSingleShot(true);
-        animateTimer->setInterval(50);
-        animateTimer->start();
+      animateTimer->stop();
+      animateTimer->setSingleShot(true);
+      animateTimer->setInterval(50);
+      animateTimer->start();
     }
   }
 }
 
 bool Animate::dumpPictures(){
-    return this->e_dump->isChecked() && this->animateTimer->isActive();
+  return this->e_dump->isChecked() && this->animateTimer->isActive();
 }
 
 int Animate::nextFrame(){
-    if (animDumping && animDumpStartStep == animStep) {
-        animDumping = false;
+  if (animDumping && animDumpStartStep == animStep) {
+    animDumping = false;
     e_dump->setChecked(false);
   } else {
-        if (!animDumping) {
-            animDumping = true;
-            animDumpStartStep = animStep;
+    if (!animDumping) {
+      animDumping = true;
+      animDumpStartStep = animStep;
     }
   }
-    return animStep;
+  return animStep;
 }
 
 void Animate::resizeEvent(QResizeEvent *event)

src/gui/Dock.cc

@@ -8,6 +8,8 @@
 Dock::Dock(QWidget *parent) : QDockWidget(parent)
 {
   connect(this, &QDockWidget::topLevelChanged, this, &Dock::onTopLevelStatusChanged);
+  connect(this, &QDockWidget::visibilityChanged, this, &Dock::onVisibilityChanged);
+
   dockTitleWidget = new QWidget();
 }
 
@@ -21,16 +23,12 @@ void Dock::disableSettingsUpdate()
   updateSettings = false;
 }
 
-void Dock::setVisible(bool visible)
+void Dock::onVisibilityChanged(bool isDockVisible)
 {
   if (updateSettings) {
     QSettingsCached settings;
-    settings.setValue(configKey, !visible);
-  }
-  if (action != nullptr) {
-    action->setChecked(!visible);
+    settings.setValue(configKey, !isVisible());
   }
-  QDockWidget::setVisible(visible);
 }
 
 void Dock::setTitleBarVisibility(bool isVisible)
@@ -43,11 +41,6 @@ void Dock::setConfigKey(const QString& configKey)
   this->configKey = configKey;
 }
 
-void Dock::setAction(QAction *action)
-{
-  this->action = action;
-}
-
 void Dock::updateTitle(){
   QString title(name);
   if (isTopLevel() && !namesuffix.isEmpty()) {

src/gui/Dock.h

@@ -13,7 +13,6 @@ class Dock : public QDockWidget
   virtual ~Dock();
 
   void setConfigKey(const QString& configKey);
-  void setAction(QAction *action);
   void disableSettingsUpdate();
 
   void setName(const QString& name_);
@@ -23,16 +22,14 @@ class Dock : public QDockWidget
   void setTitleBarVisibility(bool isVisible);
   void updateTitle();
 
-
 public slots:
-  void setVisible(bool visible) override;
+  void onVisibilityChanged(bool visible);
   void onTopLevelStatusChanged(bool);
 
 private:
   QString name;
   QString namesuffix;
   QString configKey;
-  QAction *action{nullptr};
   bool updateSettings{true};
   QWidget *dockTitleWidget;
 };