Updated theme fix patches.

4 files changed, 14 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65a818e65209..ffde8530610b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -37,8 +37,8 @@ pkgbase = qtcreator-fixed-themes
 	source = qtcreator-breakpoint-fix.patch
 	source = qtcreator-debugger-columns-fix.patch
 	sha256sums = aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43
-	sha256sums = 6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6
-	sha256sums = a7b87219de0ee3e18754749a057535c04357acc2478dcb3fca6bc4b1ba8a8178
+	sha256sums = 9cd55729e76505ef35fe3059ddbaa86b1071f9f0075b4313f3ccbb8593094681
+	sha256sums = 6fa5ca49df0b4a79e25a812e21f6f378ee3cd3f6d1f8a2cb4e10ea8b60b0f007
 	sha256sums = 514d9ff2989b0c865ead40b62df79f46871cbc1840ca552c64947b2e6c7d7d18
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
diff --git a/PKGBUILD b/PKGBUILD
index 45f27d9a20ea..124037480f8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,8 +40,8 @@ source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/
 		qtcreator-breakpoint-fix.patch
 		qtcreator-debugger-columns-fix.patch)
 sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
-            '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
-            'a7b87219de0ee3e18754749a057535c04357acc2478dcb3fca6bc4b1ba8a8178'
+            '9cd55729e76505ef35fe3059ddbaa86b1071f9f0075b4313f3ccbb8593094681'
+            '6fa5ca49df0b4a79e25a812e21f6f378ee3cd3f6d1f8a2cb4e10ea8b60b0f007'
             '514d9ff2989b0c865ead40b62df79f46871cbc1840ca552c64947b2e6c7d7d18'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
diff --git a/qtcreator-dark-and-flat-selection-fixes.patch b/qtcreator-dark-and-flat-selection-fixes.patch
index 7002702c9b6d..c32565fd0331 100644
--- a/qtcreator-dark-and-flat-selection-fixes.patch
+++ b/qtcreator-dark-and-flat-selection-fixes.patch
@@ -21,7 +21,7 @@ index 5da67fa236..6b1f2fba96 100644
  PaletteDark=shadowBackground
  PaletteHighlightedText=textHighlighted
 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
-index 9c713b4202..ba1978586c 100644
+index e73d10b0ff..3faa2223a1 100644
 --- a/share/qtcreator/themes/flat-dark.creatortheme
 +++ b/share/qtcreator/themes/flat-dark.creatortheme
 @@ -13,7 +13,7 @@ toolBarItemDisabled=60a4a6a8
@@ -29,8 +29,8 @@ index 9c713b4202..ba1978586c 100644
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
 -selectedBackground=66000000
-+selectedBackground=aa1f75cc
- selectedBackgroundText=aa1f75cc
++selectedBackground=ff1d545c
+ selectedBackgroundText=ff1d545c
  normalBackground=ff2E2F30
  alternateBackground=ff353637
 @@ -223,7 +223,7 @@ PaletteBrightText=ffff3333
@@ -43,7 +43,7 @@ index 9c713b4202..ba1978586c 100644
  PaletteDark=shadowBackground
  PaletteHighlightedText=textHighlighted
 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
-index 5932ae86dc..27fbbb2866 100644
+index 29edca63fd..826c798faa 100644
 --- a/share/qtcreator/themes/flat-light.creatortheme
 +++ b/share/qtcreator/themes/flat-light.creatortheme
 @@ -11,7 +11,7 @@ toolBarItemDisabled=38000000
@@ -51,12 +51,12 @@ index 5932ae86dc..27fbbb2866 100644
  fancyBarsBoldTextColor=a0010508
  hoverBackground=1a000000
 -selectedBackground=a8ffffff
-+selectedBackground=55000000
++selectedBackground=553daee9
  normalBackground=ffffffff
  alternateBackground=ff515151
  stop_error=ffec7373
 diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
-index ab0189528f..10a60c1aad 100644
+index ab0189528f..668d4bf612 100644
 --- a/share/qtcreator/themes/flat.creatortheme
 +++ b/share/qtcreator/themes/flat.creatortheme
 @@ -11,7 +11,7 @@ toolBarItemDisabled=60a4a6a8
@@ -64,7 +64,7 @@ index ab0189528f..10a60c1aad 100644
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
 -selectedBackground=66000000
-+selectedBackground=ff1f75cc
++selectedBackground=aa3daee9
  normalBackground=ffffffff
  alternateBackground=ff515151
  error=ffdf4f4f
diff --git a/qtcreator-dark-theme-fixes.patch b/qtcreator-dark-theme-fixes.patch
index 6042615de97d..ead723716b3f 100644
--- a/qtcreator-dark-theme-fixes.patch
+++ b/qtcreator-dark-theme-fixes.patch
@@ -44,21 +44,21 @@ index ef19fc9fa6..5da67fa236 100644
  PaletteLink=textColorLink
  PaletteLinkVisited=textColorLinkVisited
 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
-index 0c01aa1707..9c713b4202 100644
+index 0c01aa1707..e73d10b0ff 100644
 --- a/share/qtcreator/themes/flat-dark.creatortheme
 +++ b/share/qtcreator/themes/flat-dark.creatortheme
 @@ -7,12 +7,14 @@ DefaultTextEditorColorScheme=creator-dark.xml
  shadowBackground=ff404244
  text=ffd0d0d0
  textDisabled=60a4a6a8
-+textHighlighted=ffd0d0d0
++textHighlighted=fff0f0f0
  toolBarItem=b6fbfdff
  toolBarItemDisabled=60a4a6a8
  fancyBarsNormalTextColor=ffd0d0d0
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
  selectedBackground=66000000
-+selectedBackgroundText=aa1f75cc
++selectedBackgroundText=ff1d545c
  normalBackground=ff2E2F30
  alternateBackground=ff353637
  error=ffdf4f4f
@@ -92,19 +92,6 @@ index 0c01aa1707..9c713b4202 100644
  PaletteToolTipText=text
  PaletteLink=textColorLink
  PaletteLinkVisited=textColorLinkVisited
-diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
-index 29edca63fd..5932ae86dc 100644
---- a/share/qtcreator/themes/flat-light.creatortheme
-+++ b/share/qtcreator/themes/flat-light.creatortheme
-@@ -145,7 +145,7 @@ OutputPanes_TestWarnTextColor=ffd0bb00
- OutputPanes_TestFatalTextColor=ff640000
- OutputPanes_TestDebugTextColor=ff329696
- OutputPaneButtonFlashColor=ffff0000
--OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor
-+OutputPaneToggleButtonTextColorChecked=ffffffff
- OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor
- 
- Debugger_LogWindow_LogInput=ff00acac
 diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
 index 7276685d20..2421bd776a 100644
 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp