Add missing black color into browserbox.

13 files changed, 33 insertions, 11 deletions

diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index fb1fe165c..2d0fd5a6e 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -84,6 +84,7 @@
         <color id="PLAYER_ADVANCED" color="#005000" />
         <color id="BUBBLE_NAME" color="#ffffff" />
         <color id="BUBBLE_TEXT" color="#ffffff" />
+        <color id="BLACK" color="#000000" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 51c724f5f..c53f06686 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -87,6 +87,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#ffffff" />
         <color id="RED" color="#ffffff" />
         <color id="GREEN" color="#ffffff" />
         <color id="BLUE" color="#ffffff" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 676249d0e..f6e3d237c 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -86,6 +86,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#7a7972" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index 7feb5c9c6..f448e2bfe 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -87,6 +87,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#000000" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index 099e343c7..ba541150a 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -71,6 +71,7 @@
         <color id="PLAYER_ADVANCED" color="#005000" />
         <color id="BUBBLE_NAME" color="#cccccc" />
         <color id="BUBBLE_TEXT" color="#ffffff" />
+        <color id="BLACK" color="#402600" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
@@ -205,6 +206,8 @@
         <color id="SERVER_OUTLINE" color="#142200" />
         <color id="BROWSERBOX" color="#999999" />
         <color id="BROWSERBOX_OUTLINE" color="#000000" />
+        <color id="BLACK" color="#202020" />
+        <color id="BLACK_OUTLINE" color="#606060" />
         <color id="RED" color="#ff6565" />
         <color id="RED_OUTLINE" color="#470303" />
         <color id="GREEN" color="#57cb21" />
@@ -222,7 +225,7 @@
         <color id="GRAY" color="#dbdbdb" />
         <color id="GRAY_OUTLINE" color="#333333" />
         <color id="BROWN" color="#dbdbdb" />
-        <color id="BROWN_OUTLINE" color="#333333" />        
+        <color id="BROWN_OUTLINE" color="#333333" />
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
     </palette>
@@ -297,6 +300,7 @@
         <color id="PLAYER_ADVANCED" color="#005000" />
         <color id="BUBBLE_NAME" color="#cccccc" />
         <color id="BUBBLE_TEXT" color="#ffffff" />
+        <color id="BLACK" color="#000000" />
         <color id="RED" color="#bf0000" />
         <color id="GREEN" color="#000000" />
         <color id="BLUE" color="#bf0000" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 4d924a1f3..2636728db 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -87,6 +87,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#000000" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index 1f2c4df38..a59dde18a 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -87,6 +87,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#000000" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 0c708e5d1..3b5a81e1c 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -86,6 +86,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#0E0E0E" />
         <color id="RED" color="#FFA8A8" />
         <color id="GREEN" color="#59FF6C" />
         <color id="BLUE" color="#00FFFF" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 0ea653bc5..cc36392e9 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -87,6 +87,7 @@
         <color id="STATUSBAR_ON" color="#646464" />
         <color id="STATUSBAR_OFF" color="#ffff00" />
 
+        <color id="BLACK" color="#000000" />
         <color id="RED" color="#ff0000" />
         <color id="GREEN" color="#009000" />
         <color id="BLUE" color="#0000ff" />
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 8f10a9372..68aae255c 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -923,6 +923,8 @@ static int readColorType(const std::string &type)
         "BUBBLE_NAME_OUTLINE",
         "BUBBLE_TEXT",
         "BUBBLE_TEXT_OUTLINE",
+        "BLACK",
+        "BLACK_OUTLINE",
         "RED",
         "RED_OUTLINE",
         "GREEN",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 3a56cfcfb..909fbca78 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -365,6 +365,8 @@ class Theme final : public Palette, public ConfigListener
             BUBBLE_NAME_OUTLINE,
             BUBBLE_TEXT,
             BUBBLE_TEXT_OUTLINE,
+            BLACK,
+            BLACK_OUTLINE,
             RED,
             RED_OUTLINE,
             GREEN,
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 603c79825..b41d319a3 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -89,6 +89,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
         mNewLinePadding = mSkin->getOption("newLinePadding", 15);
     }
 
+    mColors[0][BLACK] = getThemeColor(Theme::BLACK);
     mColors[0][RED] = getThemeColor(Theme::RED);
     mColors[0][GREEN] = getThemeColor(Theme::GREEN);
     mColors[0][BLUE] = getThemeColor(Theme::BLUE);
@@ -99,6 +100,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget, const unsigned int mode,
     mColors[0][GRAY] = getThemeColor(Theme::GRAY);
     mColors[0][BROWN] = getThemeColor(Theme::BROWN);
 
+    mColors[1][BLACK] = getThemeColor(Theme::BLACK_OUTLINE);
     mColors[1][RED] = getThemeColor(Theme::RED_OUTLINE);
     mColors[1][GREEN] = getThemeColor(Theme::GREEN_OUTLINE);
     mColors[1][BLUE] = getThemeColor(Theme::BLUE_OUTLINE);
@@ -575,6 +577,10 @@ int BrowserBox::calcHeight()
                     {
                         switch (c)
                         {
+                            case '0':
+                                selColor[0] = mColors[0][BLACK];
+                                selColor[1] = mColors[1][BLACK];
+                                break;
                             case '1':
                                 selColor[0] = mColors[0][RED];
                                 selColor[1] = mColors[1][RED];
@@ -611,7 +617,6 @@ int BrowserBox::calcHeight()
                                 selColor[0] = mColors[0][BROWN];
                                 selColor[1] = mColors[1][BROWN];
                                 break;
-                            case '0':
                             default:
                                 selColor[0] = textColor[0];
                                 selColor[1] = textColor[1];
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 739b5a18c..e8975a40c 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -186,15 +186,16 @@ class BrowserBox final : public gcn::Widget,
         enum
         {
             RED = 0,
-            GREEN = 1,
-            BLUE = 2,
-            ORANGE = 3,
-            YELLOW = 4,
-            PINK = 5,
-            PURPLE = 6,
-            GRAY = 7,
-            BROWN = 8,
-            COLORS_MAX = 9
+            BLACK,
+            GREEN,
+            BLUE,
+            ORANGE,
+            YELLOW,
+            PINK,
+            PURPLE,
+            GRAY,
+            BROWN,
+            COLORS_MAX
         };
 
         /**