Merge e47a538 into 09d33f3

opencor · Jun 15, 2018 · cb8e031 · cb8e031
2 parents 09d33f3 + e47a538
commit cb8e031
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -39,7 +39,7 @@ var jsonData = { "versions": [
                      "changes": [
                        { "change": "<strong>General:</strong> General: fixed a problem with not being able to start OpenCOR from the system PATH (see issue <a href=\"https://github.com/opencor/opencor/issues/1688\">#1688</a>)." },
                        { "change": "<strong>Text-based editors:</strong> prevent infinite \"Replace all\" actions (see issue <a href=\"https://github.com/opencor/opencor/issues/1677\">#1677</a>). Sped up our highlight/replace all method (see issue <a href=\"https://github.com/opencor/opencor/issues/1679\">#1679</a>). Now have word-wrap alignment <a href=\"https://github.com/opencor/opencor/issues/1680\">#1680</a>)." },
-                       { "change": "<strong>Simualtion Experiment view:</strong> fixed an issue with the Y axis being doubled in a very specific case (see issue <a href=\"https://github.com/opencor/opencor/issues/1683\">#1683</a>)." },
+                       { "change": "<strong>Simualtion Experiment view:</strong> fixed an issue with the Y axis being doubled in a very specific case (see issue <a href=\"https://github.com/opencor/opencor/issues/1683\">#1683</a>). Fixed some GUI glitches (see issue <a href=\"https://github.com/opencor/opencor/issues/1696\">#1696</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.27.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1672\">#1672</a>)." }
                      ]
                    },

diff --git a/src/plugins/miscellaneous/Core/src/centralwidget.cpp b/src/plugins/miscellaneous/Core/src/centralwidget.cpp
@@ -1821,22 +1821,29 @@ void CentralWidget::updateGui()
 
     // Replace the current view with the new one, if needed
     // Note: to do this as smoothly as possible, we temporarily hide the status
-    //       bar. Indeed, not to do this will result in some awful flickering
-    //       when switching from one file to another with the mouse over a
-    //       button-like widget and the status bar visible (see issues #405 and
-    //       #1027)...
+    //       bar, if we are not over a tab bar. Indeed, not to do this will
+    //       result in some awful flickering when switching from one file to
+    //       another with the mouse over a push button and the status bar
+    //       visible (see issues #405 and #1027). As for the tab bar, this is
+    //       somehow required to prevent some other GUI glitches (see issue
+    //       #1696)...
 
     if (mContents->currentWidget() != newView) {
-        bool statusBarVisible = mainWindow()->statusBar()->isVisible();
+#ifdef Q_OS_MAC
+        bool statusBarVisibleAndNotOverTabBar =     mainWindow()->statusBar()->isVisible()
+                                                && !qobject_cast<QTabBar *>(childAt(mapFromGlobal(QCursor::pos())));
 
-        if (statusBarVisible)
+        if (statusBarVisibleAndNotOverTabBar)
             mainWindow()->statusBar()->hide();
+#endif
 
         mContents->removeWidget(mContents->currentWidget());
         mContents->addWidget(newView);
 
-        if (statusBarVisible)
+#ifdef Q_OS_MAC
+        if (statusBarVisibleAndNotOverTabBar)
             mainWindow()->statusBar()->show();
+#endif
     }
 
     // Update our modified settings