From 7cefaa730024d794feeeb023f9d14c1b9855478b Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sat, 3 Jan 2015 19:28:42 +0100
Subject: [PATCH] Drop setting the WhitespaceBackgroundColor.

QScintilla uses this color even when the whitespace is selected instead of
drawing it in the selection background color. This causes selection to
look strange when the whitespace display is enabled.
---
 color-schemes/editor/dark-background.json  | 1 -
 color-schemes/editor/light-background.json | 1 -
 color-schemes/editor/monokai.json          | 1 -
 color-schemes/editor/solarized-dark.json   | 1 -
 color-schemes/editor/solarized-light.json  | 1 -
 color-schemes/editor/tomorrow-night.json   | 1 -
 color-schemes/editor/tomorrow.json         | 1 -
 color-schemes/editor/visualstudio.json     | 1 -
 src/scintillaeditor.cpp                    | 1 -
 9 files changed, 9 deletions(-)

diff --git a/color-schemes/editor/dark-background.json b/color-schemes/editor/dark-background.json
index 7ae0857e..2c199fcc 100644
--- a/color-schemes/editor/dark-background.json
+++ b/color-schemes/editor/dark-background.json
@@ -19,7 +19,6 @@
         "number" : "#ff0000",
         "string" : "#e6db74",
         "operator" : "#e8b609",
-        "whitespace-background" : "#222222",
         "whitespace-foreground" : "#e0e0e0",
         "selection-foreground" : "#ffffff",
         "selection-background" : "#4a90d9",
diff --git a/color-schemes/editor/light-background.json b/color-schemes/editor/light-background.json
index f80e735e..2c0ffb30 100644
--- a/color-schemes/editor/light-background.json
+++ b/color-schemes/editor/light-background.json
@@ -19,7 +19,6 @@
         "number" : "DarkRed",
         "string" : "DarkMagenta",
         "operator" : "Blue",
-        "whitespace-background" : "#ffffff",
         "whitespace-foreground" : "#272822",
         "selection-foreground" : "#ffffff",
         "selection-background" : "#4a90d9",
diff --git a/color-schemes/editor/monokai.json b/color-schemes/editor/monokai.json
index b4c74451..8ddac03c 100644
--- a/color-schemes/editor/monokai.json
+++ b/color-schemes/editor/monokai.json
@@ -19,7 +19,6 @@
         "number" : "#ae81ff",
         "string" : "#e6db74",
         "operator" : "#f8f8f2",
-        "whitespace-background" : "#272822",
         "whitespace-foreground" : "#f8f8f2",
         "selection-foreground" : "#272822",
         "selection-background" : "#f8f8f2",
diff --git a/color-schemes/editor/solarized-dark.json b/color-schemes/editor/solarized-dark.json
index e6ad36df..73d369fb 100644
--- a/color-schemes/editor/solarized-dark.json
+++ b/color-schemes/editor/solarized-dark.json
@@ -19,7 +19,6 @@
         "number" : "#d33682",
         "string" : "#b58900",
         "operator" : "#cb4b16",
-        "whitespace-background" : "#002b36",
         "whitespace-foreground" : "#839496",
         "selection-foreground" : "#fdf6e3",
         "selection-background" : "#657b83",
diff --git a/color-schemes/editor/solarized-light.json b/color-schemes/editor/solarized-light.json
index 40f5203f..d99bcbcd 100644
--- a/color-schemes/editor/solarized-light.json
+++ b/color-schemes/editor/solarized-light.json
@@ -19,7 +19,6 @@
         "number" : "#d33682",
         "string" : "#b58900",
         "operator" : "#cb4b16",
-        "whitespace-background" : "#fdf6e3",
         "whitespace-foreground" : "#657b83",
         "selection-foreground" : "#fdf6e3",
         "selection-background" : "#657b83",
diff --git a/color-schemes/editor/tomorrow-night.json b/color-schemes/editor/tomorrow-night.json
index 529fc910..69199850 100644
--- a/color-schemes/editor/tomorrow-night.json
+++ b/color-schemes/editor/tomorrow-night.json
@@ -19,7 +19,6 @@
         "number" : "#cc6666",
         "string" : "#b5bd68",
         "operator" : "#8abeb7",
-        "whitespace-background" : "#1d1f21",
         "whitespace-foreground" : "#c5c8c6",
         "selection-foreground" : "#373b41",
         "selection-background" : "#c5c8c6",
diff --git a/color-schemes/editor/tomorrow.json b/color-schemes/editor/tomorrow.json
index 71d2e4f1..d3cef5f4 100644
--- a/color-schemes/editor/tomorrow.json
+++ b/color-schemes/editor/tomorrow.json
@@ -19,7 +19,6 @@
         "number" : "#c82829",
         "string" : "#718c00",
         "operator" : "#3e999f",
-        "whitespace-background" : "#f8f8f8",
         "whitespace-foreground" : "#4d4d4c",
         "selection-foreground" : "#4d4d4c",
         "selection-background" : "#d6d6d6",
diff --git a/color-schemes/editor/visualstudio.json b/color-schemes/editor/visualstudio.json
index aeab6b70..9a1da1b1 100644
--- a/color-schemes/editor/visualstudio.json
+++ b/color-schemes/editor/visualstudio.json
@@ -19,7 +19,6 @@
         "number" : "DarkRed",
         "string" : "#A31515",
         "operator" : "Blue",
-        "whitespace-background" : "#ffffff",
         "whitespace-foreground" : "#101010",
         "selection-foreground" : "black",
         "selection-background" : "lightblue",
diff --git a/src/scintillaeditor.cpp b/src/scintillaeditor.cpp
index 88836747..43f36f01 100644
--- a/src/scintillaeditor.cpp
+++ b/src/scintillaeditor.cpp
@@ -304,7 +304,6 @@ void ScintillaEditor::setColormap(const EditorColorScheme *colorScheme)
 		qsci->setMarkerBackgroundColor(readColor(colors, "error-marker", QColor(255, 0, 0, 100)), markerNumber);
 		qsci->setIndicatorForegroundColor(readColor(colors, "error-indicator", QColor(255, 0, 0, 100)), indicatorNumber);
 		qsci->setIndicatorOutlineColor(readColor(colors, "error-indicator-outline", QColor(255, 0, 0, 100)), indicatorNumber);
-		qsci->setWhitespaceBackgroundColor(readColor(colors, "whitespace-background", paperColor));
 		qsci->setWhitespaceForegroundColor(readColor(colors, "whitespace-foreground", textColor));
 		qsci->setMarginsBackgroundColor(readColor(colors, "margin-background", paperColor));
 		qsci->setMarginsForegroundColor(readColor(colors, "margin-foreground", textColor));