From 04c1e52e856c43d47275932191d9f374bd987c4c Mon Sep 17 00:00:00 2001
From: Casey Langen <casey.langen@gmail.com>
Date: Mon, 13 Mar 2017 08:50:14 -0700
Subject: [PATCH] Added missing active+highlighted list item state.

---
 src/musikbox/cursespp/Colors.cpp             | 16 +++++++++++++---
 src/musikbox/data/themes/solarized_dark.json | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/musikbox/cursespp/Colors.cpp b/src/musikbox/cursespp/Colors.cpp
index 2a73e4bc2..60a6d24de 100755
--- a/src/musikbox/cursespp/Colors.cpp
+++ b/src/musikbox/cursespp/Colors.cpp
@@ -70,6 +70,8 @@ indicies we'll use to store them */
 #define THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND 42
 #define THEME_COLOR_LIST_ITEM_ACTIVE_BACKGROUND 43
 #define THEME_COLOR_LIST_ITEM_ACTIVE_FOREGROUND 44
+#define THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND 45
+#define THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND 46
 
 /* user-readable names for the color identifiers above. these are
 used as key names in the config files */
@@ -102,6 +104,8 @@ used as key names in the config files */
 #define JSON_KEY_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND "list_item_highlighted_foreground"
 #define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_BACKGROUND "list_item_active_background"
 #define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_FOREGROUND "list_item_active_foreground"
+#define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND "list_item_active_highlighted_background"
+#define JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND "list_item_active_highlighted_foreground"
 
 #define JSON_KEY_NAME "name"
 #define JSON_KEY_SCHEMA_VERSION "schemaVersion"
@@ -219,6 +223,8 @@ struct Theme {
         listHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, 0, 0, 0, COLOR_BLACK);
         listActiveBackground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_BACKGROUND, 66, 66, 56, COLOR_256_MEDIUM_GRAY);
         listActiveForeground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_FOREGROUND, 230, 220, 116, COLOR_256_YELLOW);
+        listActiveHighlightedBackground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND, 230, 220, 116, COLOR_256_YELLOW);
+        listActiveHighlightedForeground.Set(THEME_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND, 0, 0, 0, COLOR_BLACK);
     }
 
     bool LoadFromFile(const std::string& fn) {
@@ -294,6 +300,8 @@ struct Theme {
                     this->listHighlightedForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_HIGHLIGHTED_FOREGROUND, unset));
                     this->listActiveBackground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_BACKGROUND, unset));
                     this->listActiveForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_FOREGROUND, unset));
+                    this->listActiveHighlightedBackground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_BACKGROUND, unset));
+                    this->listActiveHighlightedForeground.Set(colors.value(JSON_KEY_COLOR_LIST_ITEM_ACTIVE_HIGHLIGHTED_FOREGROUND, unset));
                 }
             }
             catch (...) {
@@ -377,10 +385,10 @@ struct Theme {
             listHighlightedForeground.Id(mode, COLOR_BLACK),
             listHighlightedBackground.Id(mode, COLOR_GREEN));
 
-        init_pair( /* note: swap active fg/bg */
+        init_pair(
             CURSESPP_HIGHLIGHTED_SELECTED_LIST_ITEM,
-            listActiveBackground.Id(mode, COLOR_BLACK),
-            listActiveForeground.Id(mode, COLOR_YELLOW));
+            listActiveHighlightedForeground.Id(mode, COLOR_BLACK),
+            listActiveHighlightedBackground.Id(mode, COLOR_YELLOW));
     }
 
     /* main */
@@ -425,6 +433,8 @@ struct Theme {
     Color listHighlightedForeground;
     Color listActiveForeground;
     Color listActiveBackground;
+    Color listActiveHighlightedBackground;
+    Color listActiveHighlightedForeground;
 };
 
 /* some terminals report custom colors are supported, and also
diff --git a/src/musikbox/data/themes/solarized_dark.json b/src/musikbox/data/themes/solarized_dark.json
index 529343772..13bbbb8d2 100644
--- a/src/musikbox/data/themes/solarized_dark.json
+++ b/src/musikbox/data/themes/solarized_dark.json
@@ -103,20 +103,28 @@
       "palette": 64
     },
     "list_item_highlighted_background": {
-      "hex": "#859900",
-      "palette": 64
+      "hex": "#93a1a1",
+      "palette": 245
     },
     "list_item_highlighted_foreground": {
       "hex": "#002b36",
       "palette": 234
     },
     "list_item_active_background": {
+      "hex": "#eee8d5",
+      "palette": 254
+    },
+    "list_item_active_foreground": {
       "hex": "#073642",
       "palette": 235
     },
-    "list_item_active_foreground": {
-      "hex": "#268bd2",
-      "palette": 33
+    "list_item_active_highlighted_background": {
+      "hex": "#fdf6e3",
+      "palette": 230
+    },
+    "list_item_active_highlighted_foreground": {
+      "hex": "#073642",
+      "palette": 235
     }
   }
 }
\ No newline at end of file