fix: support for custom highlight bracket color.

Change-Id: I0022810978913f9b331f8a345863a8378e3eb14f
linuxdeepin · Dec 4, 2018 · 78d6528 · 78d6528
1 parent 5db54ad
commit 78d6528
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/src/dtextedit.cpp b/src/dtextedit.cpp
@@ -82,10 +82,6 @@ DTextEdit::DTextEdit(QPlainTextEdit *parent)
 {
     lineNumberArea = new LineNumberArea(this);
 
-    m_bracketMatchFormat = currentCharFormat();
-    m_bracketMatchFormat.setBackground(Qt::yellow);
-    m_bracketMatchFormat.setForeground(Qt::black);
-
     viewport()->installEventFilter(this);
     viewport()->setCursor(Qt::IBeamCursor);
 
@@ -2025,6 +2021,10 @@ void DTextEdit::setTheme(const KSyntaxHighlighting::Theme &theme, const QString
     m_selectionColor = QColor(textStylesMap["Normal"].toMap()["selected-text-color"].toString());
     m_selectionBgColor = QColor(textStylesMap["Normal"].toMap()["selected-bg-color"].toString());
 
+    m_bracketMatchFormat = currentCharFormat();
+    m_bracketMatchFormat.setForeground(QColor(jsonMap["editor-colors"].toMap()["bracket-match-fg"].toString()));
+    m_bracketMatchFormat.setBackground(QColor(jsonMap["editor-colors"].toMap()["bracket-match-bg"].toString()));
+
     const QString &styleSheet = QString("QPlainTextEdit {"
                                         "background-color: %1;"
                                         "color: %2;"

diff --git a/src/themes/atom_dark.theme b/src/themes/atom_dark.theme
@@ -148,7 +148,8 @@
     "editor-colors": {
         "background-color" : "#282C34",
         "code-folding" : "#224e65",
-        "bracket-matching" : "#8e44ad",
+        "bracket-match-bg" : "#ffff00",
+        "bracket-match-fg" : "#000000",
         "current-line" : "#2C323C",
         "icon-border" : "#31363b",
         "indentation-line" : "#3a3f44",

diff --git a/src/themes/breeze_dark.theme b/src/themes/breeze_dark.theme
@@ -148,7 +148,8 @@
     "editor-colors": {
         "background-color" : "#232629",
         "code-folding" : "#224e65",
-        "bracket-matching" : "#8e44ad",
+        "bracket-match-bg" : "#ffff00",
+        "bracket-match-fg" : "#000000",
         "current-line" : "#2A2E32",
         "icon-border" : "#31363b",
         "indentation-line" : "#3a3f44",

diff --git a/src/themes/deepin.theme b/src/themes/deepin.theme
@@ -148,7 +148,8 @@
     "editor-colors": {
         "background-color" : "#ffffff",
         "code-folding" : "#94caef",
-        "bracket-matching" : "#ffff00",
+        "bracket-match-bg" : "#ffff00",
+        "bracket-match-fg" : "#000000",
         "current-line" : "#f8f7f6",
         "icon-border" : "#f0f0f0",
         "indentation-line" : "#d2d2d2",

diff --git a/src/themes/solarized_dark.theme b/src/themes/solarized_dark.theme
@@ -148,7 +148,8 @@
     "editor-colors": {
         "background-color" : "#002B36",
         "code-folding" : "#224e65",
-        "bracket-matching" : "#8e44ad",
+        "bracket-match-bg" : "#ffff00",
+        "bracket-match-fg" : "#000000",
         "current-line" : "#073642",
         "icon-border" : "#31363b",
         "indentation-line" : "#3a3f44",

diff --git a/src/themes/solarized_light.theme b/src/themes/solarized_light.theme
@@ -148,7 +148,8 @@
     "editor-colors": {
         "background-color" : "#FDF6E3",
         "code-folding" : "#224e65",
-        "bracket-matching" : "#8e44ad",
+        "bracket-match-bg" : "#ffff00",
+        "bracket-match-fg" : "#000000",
         "current-line" : "#EEE8D5",
         "icon-border" : "#31363b",
         "indentation-line" : "#3a3f44",