Merge a9a8b85 into 4561bd1

opencor · Feb 14, 2019 · 36198ef · 36198ef
2 parents 4561bd1 + a9a8b85
commit 36198ef
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/plugins/miscellaneous/Core/src/tabbarwidget.cpp b/src/plugins/miscellaneous/Core/src/tabbarwidget.cpp
@@ -52,7 +52,7 @@ void TabBarStyle::drawControl(ControlElement pElement,
             if (!styleHint(SH_UnderlineShortcut, pOption, pWidget))
                 alignment |= Qt::TextHideMnemonic;
 
-            bool isVerticalTab =     (tab->shape == QTabBar::RoundedWest)
+            bool isVerticalTab =    (tab->shape == QTabBar::RoundedWest)
                                  || (tab->shape == QTabBar::RoundedEast)
                                  || (tab->shape == QTabBar::TriangularWest)
                                  || (tab->shape == QTabBar::TriangularEast);
@@ -102,7 +102,7 @@ void TabBarStyle::drawControl(ControlElement pElement,
             drawItemText(pPainter, tabRect, alignment, tab->palette,
                          tab->state & State_Enabled, tab->text,
                          (   (tab->state & State_Selected)
-                          && pWidget->isActiveWindow())?
+                          && (tab->state & State_Active))?
                              QPalette::BrightText:
                              QPalette::WindowText);