Ticket #8054: Control_mark_color_1.diff

headers/os/interface/ControlLook.h

@@ -330 +330 @@
                                         = B_HORIZONTAL) const;
 
             bool                _RadioButtonAndCheckBoxMarkColor(
-                                    const rgb_color& base, rgb_color& color,
-                                    uint32 flags) const;
+                                    const rgb_color& base,
+                                    rgb_color& markColor, uint32 flags) const;
 
             void                _DrawRoundBarCorner(BView* view, BRect& rect,
                                     const BRect& updateRect,

headers/os/interface/InterfaceDefs.h

@@ -294 +294 @@
     B_CONTROL_TEXT_COLOR = 14,
     B_CONTROL_BORDER_COLOR = 15,
     B_CONTROL_HIGHLIGHT_COLOR = 16,
+    B_CONTROL_MARK_COLOR = 25,
     B_NAVIGATION_BASE_COLOR = 4,
     B_NAVIGATION_PULSE_COLOR = 17,
     B_SHINE_COLOR = 18,

headers/private/app/ServerReadOnlyMemory.h

@@ -26 +26 @@
 color_which_to_index(color_which which)
 {
     // NOTE: this must be kept in sync with InterfaceDefs.h color_which!
-    if (which <= B_WINDOW_INACTIVE_TEXT_COLOR)
+    if (which <= B_CONTROL_MARK_COLOR)
         return which - 1;
     if (which >= B_SUCCESS_COLOR && which <= B_FAILURE_COLOR)
-        return which - B_SUCCESS_COLOR + B_WINDOW_INACTIVE_TEXT_COLOR;
+        return which - B_SUCCESS_COLOR + B_CONTROL_MARK_COLOR;
 
     return -1;
 }
@@ -38 +38 @@
 index_to_color_which(int32 index)
 {
     if (index >= 0 && index < kNumColors) {
-        if ((color_which)index < B_WINDOW_INACTIVE_TEXT_COLOR)
+        if ((color_which)index < B_CONTROL_MARK_COLOR)
             return (color_which)(index + 1);
         else 
-            return (color_which)(index + B_SUCCESS_COLOR - B_WINDOW_INACTIVE_TEXT_COLOR);
+            return (color_which)(index + B_SUCCESS_COLOR - B_CONTROL_MARK_COLOR);
     }
 
     return (color_which)-1;

src/bin/WindowShade.cpp

@@ -43 +43 @@
     I(control_text_color, B_CONTROL_TEXT_COLOR),
     I(control_border_color, B_CONTROL_BORDER_COLOR),
     I(control_highlight_color, B_CONTROL_HIGHLIGHT_COLOR),
+    I(control_mark_color, B_CONTROL_MARK_COLOR),
     I(navigation_base_color, B_NAVIGATION_BASE_COLOR),
     I(navigation_pulse_color, B_NAVIGATION_PULSE_COLOR),
     I(shine_color, B_SHINE_COLOR),

src/kits/interface/ControlLook.cpp

@@ -8 +8 @@
 
 #include <Control.h>
 #include <GradientLinear.h>
+#include <InterfaceDefs.h>
 #include <Region.h>
 #include <Shape.h>
 #include <String.h>
@@ -2181 +2182 @@
 
 bool
 BControlLook::_RadioButtonAndCheckBoxMarkColor(const rgb_color& base,
-    rgb_color& color, uint32 flags) const
+    rgb_color& markColor, uint32 flags) const
 {
     if ((flags & (B_ACTIVATED | B_CLICKED)) == 0) {
         // no mark to be drawn at all
         return false;
     }
 
-    // TODO: Get from UI settings
-    color.red = 27;
-    color.green = 82;
-    color.blue = 140;
+    markColor = ui_color(B_CONTROL_MARK_COLOR);
 
     float mix = 1.0;
 
@@ -2210 +2208 @@
         // simply activated
     }
 
-    color.red = uint8(color.red * mix + base.red * (1.0 - mix));
-    color.green = uint8(color.green * mix + base.green * (1.0 - mix));
-    color.blue = uint8(color.blue * mix + base.blue * (1.0 - mix));
+    markColor.red = uint8(markColor.red * mix + base.red * (1.0 - mix));
+    markColor.green = uint8(markColor.green * mix + base.green * (1.0 - mix));
+    markColor.blue = uint8(markColor.blue * mix + base.blue * (1.0 - mix));
 
     return true;
 }

src/kits/interface/InterfaceDefs.cpp

@@ -73 +73 @@
     {216, 216, 216, 255},   // B_PANEL_BACKGROUND_COLOR
     {216, 216, 216, 255},   // B_MENU_BACKGROUND_COLOR
     {255, 203, 0, 255},     // B_WINDOW_TAB_COLOR
-    {0, 0, 229, 255},       // B_KEYBOARD_NAVIGATION_COLOR
+    {0, 0, 229, 255},       // B_NAVIGATION_BASE_COLOR
+                            // (B_KEYBOARD_NAVIGATION_COLOR)
     {51, 102, 152, 255},    // B_DESKTOP_COLOR
     {153, 153, 153, 255},   // B_MENU_SELECTED_BACKGROUND_COLOR
     {0, 0, 0, 255},         // B_MENU_ITEM_TEXT_COLOR
@@ -89 +90 @@
     {0, 0, 0, 255},         // B_NAVIGATION_PULSE_COLOR
     {255, 255, 255, 255},   // B_SHINE_COLOR
     {0, 0, 0, 255},         // B_SHADOW_COLOR
-    {255, 255, 216, 255},   // B_TOOLTIP_BACKGROUND_COLOR
-    {0, 0, 0, 255},         // B_TOOLTIP_TEXT_COLOR
+    {255, 255, 216, 255},   // B_TOOL_TIP_BACKGROUND_COLOR
+    {0, 0, 0, 255},         // B_TOOL_TIP_TEXT_COLOR
     {0, 0, 0, 255},         // B_WINDOW_TEXT_COLOR
     {232, 232, 232, 255},   // B_WINDOW_INACTIVE_TAB_COLOR
     {80, 80, 80, 255},      // B_WINDOW_INACTIVE_TEXT_COLOR
+    {27, 82, 140, 255},     // B_CONTROL_MARK_COLOR
     // 100...
     {0, 255, 0, 255},       // B_SUCCESS_COLOR
     {255, 0, 0, 255},       // B_FAILURE_COLOR

src/preferences/appearance/ColorSet.cpp

@@ -13 +13 @@
 #include <Directory.h>
 #include <Entry.h>
 #include <File.h>
+#include <GraphicsDefs.h>
 #include <InterfaceDefs.h>
 #include <Locale.h>
 #include <Message.h>
@@ -32 +33 @@
     { B_CONTROL_TEXT_COLOR, B_TRANSLATE_MARK("Control text") },
     { B_CONTROL_BORDER_COLOR, B_TRANSLATE_MARK("Control border") },
     { B_CONTROL_HIGHLIGHT_COLOR, B_TRANSLATE_MARK("Control highlight") },
+    { B_CONTROL_MARK_COLOR, B_TRANSLATE_MARK("Control mark") },
     { B_NAVIGATION_BASE_COLOR, B_TRANSLATE_MARK("Navigation base") },
     { B_NAVIGATION_PULSE_COLOR, B_TRANSLATE_MARK("Navigation pulse") },
     { B_SHINE_COLOR, B_TRANSLATE_MARK("Shine") },
@@ -111 +113 @@
     ColorSet set;
     set.fColors[B_PANEL_BACKGROUND_COLOR] = make_color(216, 216, 216);
     set.fColors[B_PANEL_TEXT_COLOR] = make_color(0, 0, 0);
-    set.fColors[B_DOCUMENT_BACKGROUND_COLOR] = make_color(255,255, 255);
+    set.fColors[B_DOCUMENT_BACKGROUND_COLOR] = make_color(255, 255, 255);
     set.fColors[B_DOCUMENT_TEXT_COLOR] = make_color(0, 0, 0);
     set.fColors[B_CONTROL_BACKGROUND_COLOR] = make_color(245, 245, 245);
     set.fColors[B_CONTROL_TEXT_COLOR] = make_color(0, 0, 0);
     set.fColors[B_CONTROL_BORDER_COLOR] = make_color(0, 0, 0);
-    set.fColors[B_CONTROL_HIGHLIGHT_COLOR] = make_color(102, 152, 203);
+    set.fColors[B_CONTROL_HIGHLIGHT_COLOR] = make_color(153, 153, 153);
+    set.fColors[B_CONTROL_MARK_COLOR] = make_color(27, 82, 140);
     set.fColors[B_NAVIGATION_BASE_COLOR] = make_color(0, 0, 229);
     set.fColors[B_NAVIGATION_PULSE_COLOR] = make_color(0, 0, 0);
     set.fColors[B_SHINE_COLOR] = make_color(255, 255, 255);
@@ -124 +127 @@
     set.fColors[B_MENU_BACKGROUND_COLOR] = make_color(216, 216, 216);
     set.fColors[B_MENU_SELECTED_BACKGROUND_COLOR] = make_color(115, 120, 184);
     set.fColors[B_MENU_ITEM_TEXT_COLOR] = make_color(0, 0, 0);
-    set.fColors[B_MENU_SELECTED_ITEM_TEXT_COLOR] = make_color(255, 255, 255);
+    set.fColors[B_MENU_SELECTED_ITEM_TEXT_COLOR] = make_color(0, 0, 0);
     set.fColors[B_MENU_SELECTED_BORDER_COLOR] = make_color(0, 0, 0);
     set.fColors[B_TOOL_TIP_BACKGROUND_COLOR] = make_color(255, 255, 0);
     set.fColors[B_TOOL_TIP_TEXT_COLOR] = make_color(0, 0, 0);