From d40c4f2797685584d25052bb03b93a57ebb23fba Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 6 Jul 2016 18:15:44 +0200
Subject: [PATCH] Core: Fix the FancyActionBar color for Classic theme

Task-number: QTCREATORBUG-16562
Change-Id: I1738f25ee93831ecbc4958e25099c97c707d7bca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/coreplugin/fancyactionbar.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 28a334637cb..e6ad99bc1bd 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -230,10 +230,15 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
         } else {
             splitBuildConfiguration = splitInTwoLines(buildConfiguration, boldFm, availableWidth);
         }
-        // draw the two lines for the build configuration
+
+        // draw the two text lines for the build configuration
         painter.setPen(creatorTheme()->color(isEnabled()
-                                             ? Theme::FancyTabWidgetEnabledSelectedTextColor
-                                             : Theme::FancyTabWidgetDisabledSelectedTextColor));
+                                             // Intentionally using the "Unselected" colors,
+                                             // because the text color won't change in the pressed
+                                             // state as they would do on the mode buttons.
+                                             ? Theme::FancyTabWidgetEnabledUnselectedTextColor
+                                             : Theme::FancyTabWidgetDisabledUnselectedTextColor));
+
         for (int i = 0; i < 2; ++i) {
             if (splitBuildConfiguration[i].isEmpty())
                 continue;