From 13a12fadaa3e3ae34e8718dc5bfe74621e07a7db Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 23 May 2013 13:28:08 +0300
Subject: Add missing black color into browserbox.

---
 src/gui/theme.cpp              |  2 ++
 src/gui/theme.h                |  2 ++
 src/gui/widgets/browserbox.cpp |  7 ++++++-
 src/gui/widgets/browserbox.h   | 19 ++++++++++---------
 4 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'src/gui')

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
         };
 
         /**
-- 
cgit v1.2.3-60-g2f50