ThemeProvider: Detect auto comments, updated themes

REDasmOrg · Mar 29, 2021 · 043686d · 043686d
1 parent 053322a
commit 043686d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/LibREDasm b/LibREDasm
diff --git a/themeprovider.cpp b/themeprovider.cpp
@@ -55,9 +55,6 @@ QIcon ThemeProvider::icon(const QString &name)
                                            .arg(name));
 }
 
-QColor ThemeProvider::seekColor() { return ThemeProvider::themeValue(Theme_Seek); }
-QColor ThemeProvider::metaColor() { return ThemeProvider::themeValue(Theme_Meta); }
-
 void ThemeProvider::applyTheme()
 {
     REDasmSettings settings;
@@ -90,8 +87,8 @@ void ThemeProvider::applyListingTheme()
         { "foreground", Theme_Foreground },
         { "background", Theme_Background },
         { "seek", Theme_Seek },
+        { "auto_comment", Theme_AutoComment },
         { "comment", Theme_Comment },
-        { "meta", Theme_Meta },
         { "highlight_fg", Theme_HighlightFg },
         { "highlight_bg", Theme_HighlightBg },
         { "selection_fg", Theme_SelectionFg },

diff --git a/themeprovider.h b/themeprovider.h
@@ -24,8 +24,6 @@ class ThemeProvider
         static bool isDarkTheme();
         static QColor themeValue(rd_type theme);
         static QIcon icon(const QString& name);
-        static QColor seekColor();
-        static QColor metaColor();
         static void applyTheme();
 
     private:

diff --git a/themes/dark.json b/themes/dark.json
@@ -13,12 +13,13 @@
     "ToolTipText": "#ecf0f1",
 
     "seek": "#3b3b3b",
-    "comment": "#16a085",
+    "comment": "#2ecc71",
+    "auto_comment": "#16a085",
 
     "highlight_fg": "#3b3b3b",
-    "highlight_bg": "#2ecc71",
+    "highlight_bg": "#ef717a",
 
-    "segment": "#2ecc71",
+    "segment": "#f47cc3",
     "function": "#3498db",
 
     "address": "#6a89b4",

diff --git a/themes/light.json b/themes/light.json
@@ -1,11 +1,12 @@
 {
     "seek": "#ecf0f1",
-    "comment": "#356272",
+    "comment": "#3974aa",
+    "auto_comment": "#0f4f34",
 
     "highlight_fg": "#2b2b2b",
     "highlight_bg": "#aefbaf",
 
-    "segment": "#008080",
+    "segment": "#662621",
     "function": "#c71585",
 
     "address": "#065f88",
+2 −1		rdapi/config.h
+10 −10		rdcore/config.cpp
+4 −2		rdcore/config.h
+5 −8		rdcore/surface/renderer.cpp