Updated dark and flat theme selection patch.

Now uses a bar on the left of the workspace selector. Also fixes the
design theme.

3 files changed, 133 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca19507b9b4e..ce6b835bf82d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qtcreator-fixed-themes
 	pkgdesc = Lightweight, cross-platform integrated development environment, with fixes applied for various themes and other bug fixes
 	pkgver = 4.8.0
-	pkgrel = 9
+	pkgrel = 10
 	url = http://qt-project.org
 	arch = x86_64
 	license = LGPL
@@ -39,7 +39,7 @@ pkgbase = qtcreator-fixed-themes
 	sha256sums = aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43
 	sha256sums = 6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6
 	sha256sums = 9cd55729e76505ef35fe3059ddbaa86b1071f9f0075b4313f3ccbb8593094681
-	sha256sums = 0a605a363a23f6baf5543ea5e27ecfd87f1072322f3a455d3ce15effcf668be4
+	sha256sums = 9ed32ab0d52ec981848bb424434e8d28cc34799035bb7471f08407e093cef059
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
 	sha256sums = 12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f
diff --git a/PKGBUILD b/PKGBUILD
index 622022534bee..107301a5b1fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=qtcreator-fixed-themes
 pkgver=4.8.0
 _clangver=7.0.1
-pkgrel=9
+pkgrel=10
 pkgdesc='Lightweight, cross-platform integrated development environment, with fixes applied for various themes and other bug fixes'
 arch=(x86_64)
 url='http://qt-project.org'
@@ -42,7 +42,7 @@ source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/
 sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
             '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
             '9cd55729e76505ef35fe3059ddbaa86b1071f9f0075b4313f3ccbb8593094681'
-            '0a605a363a23f6baf5543ea5e27ecfd87f1072322f3a455d3ce15effcf668be4'
+            '9ed32ab0d52ec981848bb424434e8d28cc34799035bb7471f08407e093cef059'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
 			'12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f'
diff --git a/qtcreator-dark-and-flat-selection-fixes.patch b/qtcreator-dark-and-flat-selection-fixes.patch
index 02e7cc9d318d..fd40b7b2b1f2 100644
--- a/qtcreator-dark-and-flat-selection-fixes.patch
+++ b/qtcreator-dark-and-flat-selection-fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
-index 5da67fa236..6b1f2fba96 100644
+index 5da67fa236..41439ff22a 100644
 --- a/share/qtcreator/themes/dark.creatortheme
 +++ b/share/qtcreator/themes/dark.creatortheme
 @@ -9,7 +9,7 @@ text=ffe7e7e7
@@ -11,7 +11,15 @@ index 5da67fa236..6b1f2fba96 100644
  selectedBackgroundText=aa1f75cc
  normalBackground=ff333333
  alternateBackground=ff515151
-@@ -205,7 +205,7 @@ PaletteBrightText=ffff0000
+@@ -50,6 +50,7 @@ DoubleTabWidget2ndTabInactiveTextColor=textDisabled
+ EditorPlaceholderColor=normalBackground
+ FancyToolBarSeparatorColor=43ffffff
+ FancyTabBarBackgroundColor=shadowBackground
++FancyTabBarSelectedBackgroundColor=88000000
+ FancyTabWidgetDisabledSelectedTextColor=textDisabled
+ FancyTabWidgetDisabledUnselectedTextColor=textDisabled
+ FancyTabWidgetEnabledSelectedTextColor=text
+@@ -205,7 +206,7 @@ PaletteBrightText=ffff0000
  PaletteText=text
  PaletteButtonText=text
  PaletteButtonTextDisabled=textDisabled
@@ -20,33 +28,97 @@ index 5da67fa236..6b1f2fba96 100644
  PaletteHighlight=selectedBackgroundText
  PaletteDark=shadowBackground
  PaletteHighlightedText=textHighlighted
+diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
+index 8db109f313..cd90ad49de 100644
+--- a/share/qtcreator/themes/design.creatortheme
++++ b/share/qtcreator/themes/design.creatortheme
+@@ -17,6 +17,9 @@ text=ffdadada
+ ;disabled text
+ textDisabled=60a4a6a8
+ 
++;background for selected text
++selectedBackgroundText=aa1f75cc
++
+ ;icons, spinbox ticks,
+ ;toolBarItem=b6fbfdff
+ toolBarItem=ffb3b3b3
+@@ -50,7 +53,7 @@ hoverBackground=ff404244
+ ;blended background color for controls 1 spinboxes, background selection square for snapping modes, publish as alias icon.
+ ;color for filter background and overwrite width and height boxes
+ ;selectedBackground=66000000
+-selectedBackground=ff111111
++selectedBackground=aa1f75cc
+ 
+ 
+ ;background for default "open a document" screen in the edit mode,
+@@ -108,6 +111,7 @@ DoubleTabWidget2ndTabInactiveTextColor=text
+ EditorPlaceholderColor=normalBackground
+ FancyToolBarSeparatorColor=toolBarItemDisabled
+ FancyTabBarBackgroundColor=shadowBackground
++FancyTabBarSelectedBackgroundColor=ff000000
+ FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled
+ FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled
+ FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor
+@@ -378,7 +382,7 @@ PaletteToolTipBase=selectedBackground
+ 
+ 
+ ;the selection highlight on the dropdown combo box in the file selection top menu and connections panel and tab mode selector dropdowns
+-PaletteHighlight=selectedBackground
++PaletteHighlight=selectedBackgroundText
+ ;PaletteHighlight=ffd3299a
+ 
+ 
 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
-index e73d10b0ff..a4f263c1f7 100644
+index e73d10b0ff..07ecd43465 100644
 --- a/share/qtcreator/themes/flat-dark.creatortheme
 +++ b/share/qtcreator/themes/flat-dark.creatortheme
-@@ -13,7 +13,7 @@ toolBarItemDisabled=60a4a6a8
+@@ -5,6 +5,7 @@ DefaultTextEditorColorScheme=creator-dark.xml
+ 
+ [Palette]
+ shadowBackground=ff404244
++darkBackground=66000000
+ text=ffd0d0d0
+ textDisabled=60a4a6a8
+ textHighlighted=fff0f0f0
+@@ -13,7 +14,7 @@ toolBarItemDisabled=60a4a6a8
  fancyBarsNormalTextColor=ffd0d0d0
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
 -selectedBackground=66000000
-+selectedBackground=aa1d545c
++selectedBackground=ff1d545c
  selectedBackgroundText=ff1d545c
  normalBackground=ff2E2F30
  alternateBackground=ff353637
-@@ -223,7 +223,7 @@ PaletteBrightText=ffff3333
+@@ -54,6 +55,7 @@ DoubleTabWidget2ndTabInactiveTextColor=text
+ EditorPlaceholderColor=normalBackground
+ FancyToolBarSeparatorColor=toolBarItemDisabled
+ FancyTabBarBackgroundColor=shadowBackground
++FancyTabBarSelectedBackgroundColor=darkBackground
+ FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled
+ FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled
+ FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor
+@@ -223,7 +225,7 @@ PaletteBrightText=ffff3333
  PaletteText=text
  PaletteButtonText=text
  PaletteButtonTextDisabled=textDisabled
 -PaletteToolTipBase=selectedBackground
-+PaletteToolTipBase=66000000
++PaletteToolTipBase=darkBackground
  PaletteHighlight=selectedBackgroundText
  PaletteDark=shadowBackground
  PaletteHighlightedText=textHighlighted
 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
-index 29edca63fd..826c798faa 100644
+index 29edca63fd..9cf6608ae4 100644
 --- a/share/qtcreator/themes/flat-light.creatortheme
 +++ b/share/qtcreator/themes/flat-light.creatortheme
-@@ -11,7 +11,7 @@ toolBarItemDisabled=38000000
+@@ -4,6 +4,7 @@ PreferredStyles=
+ 
+ [Palette]
+ shadowBackground=ffe4e4e4
++lightBackground=a8ffffff
+ text=ff000000
+ textDisabled=55000000
+ toolBarItem=a0010508
+@@ -11,7 +12,7 @@ toolBarItemDisabled=38000000
  fancyBarsNormalTextColor=ff000000
  fancyBarsBoldTextColor=a0010508
  hoverBackground=1a000000
@@ -55,8 +127,16 @@ index 29edca63fd..826c798faa 100644
  normalBackground=ffffffff
  alternateBackground=ff515151
  stop_error=ffec7373
+@@ -50,6 +51,7 @@ DoubleTabWidget2ndTabInactiveTextColor=ff000000
+ EditorPlaceholderColor=fff4f4f4
+ FancyToolBarSeparatorColor=toolBarItemDisabled
+ FancyTabBarBackgroundColor=shadowBackground
++FancyTabBarSelectedBackgroundColor=lightBackground
+ FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled
+ FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled
+ FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor
 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
-index ab0189528f..668d4bf612 100644
+index ab0189528f..a75a90b589 100644
 --- a/share/qtcreator/themes/flat.creatortheme
 +++ b/share/qtcreator/themes/flat.creatortheme
 @@ -11,7 +11,7 @@ toolBarItemDisabled=60a4a6a8
@@ -68,3 +148,42 @@ index ab0189528f..668d4bf612 100644
  normalBackground=ffffffff
  alternateBackground=ff515151
  error=ffdf4f4f
+@@ -48,6 +48,7 @@ DoubleTabWidget2ndTabInactiveTextColor=ff000000
+ EditorPlaceholderColor=ffdddddd
+ FancyToolBarSeparatorColor=toolBarItemDisabled
+ FancyTabBarBackgroundColor=shadowBackground
++FancyTabBarSelectedBackgroundColor=66000000
+ FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled
+ FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled
+ FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor
+diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
+index 9a881e9e64..f350bf0ca2 100644
+--- a/src/libs/utils/theme/theme.h
++++ b/src/libs/utils/theme/theme.h
+@@ -80,6 +80,7 @@ public:
+         EditorPlaceholderColor,
+         FancyToolBarSeparatorColor,
+         FancyTabBarBackgroundColor,
++        FancyTabBarSelectedBackgroundColor,
+         FancyTabWidgetDisabledSelectedTextColor,
+         FancyTabWidgetDisabledUnselectedTextColor,
+         FancyTabWidgetEnabledSelectedTextColor,
+diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
+index 31ef98704c..677ff22e3a 100644
+--- a/src/plugins/coreplugin/fancytabwidget.cpp
++++ b/src/plugins/coreplugin/fancytabwidget.cpp
+@@ -349,7 +349,13 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
+     if (selected) {
+         if (creatorTheme()->flag(Theme::FlatToolBars)) {
+             // background color of a fancy tab that is active
+-            painter->fillRect(rect, creatorTheme()->color(Theme::FancyToolButtonSelectedColor));
++            int selectedWidth = std::min(5, rect.width());
++            int selectedBackgroundWidth = rect.width() - selectedWidth;
++            const QRect selectedRect = QRect(rect.topLeft(), QSize(selectedWidth, rect.height()));
++            const QRect selectedBackgroundRect = QRect(QPoint(rect.x() + selectedWidth, rect.y()),
++                                                       QSize(selectedBackgroundWidth, rect.height()));
++            painter->fillRect(selectedRect, creatorTheme()->color(Theme::FancyToolButtonSelectedColor));
++            painter->fillRect(selectedBackgroundRect, creatorTheme()->color(Theme::FancyTabBarSelectedBackgroundColor));
+         } else {
+             paintSelectedTabBackground(painter, rect);
+         }