diff --git headers/os/interface/InterfaceDefs.h headers/os/interface/InterfaceDefs.h
index 40f2d89..0f85a48 100644
|
|
enum color_which {
|
322 | 322 | B_WINDOW_TAB_COLOR = 3, |
323 | 323 | B_WINDOW_TEXT_COLOR = 22, |
324 | 324 | B_WINDOW_INACTIVE_TAB_COLOR = 23, |
325 | | B_WINDOW_INACTIVE_TEXT_COLOR = 24 |
| 325 | B_WINDOW_INACTIVE_TEXT_COLOR = 24, |
| 326 | |
| 327 | B_WINDOW_BORDER_COLOR = 25, |
| 328 | B_WINDOW_INACTIVE_BORDER_COLOR = 26 |
326 | 329 | }; |
327 | 330 | |
328 | 331 | |
diff --git headers/private/app/ServerReadOnlyMemory.h headers/private/app/ServerReadOnlyMemory.h
index e0bb817..477ee4c 100644
|
|
static inline int32
|
26 | 26 | color_which_to_index(color_which which) |
27 | 27 | { |
28 | 28 | // NOTE: this must be kept in sync with InterfaceDefs.h color_which! |
29 | | if (which <= B_WINDOW_INACTIVE_TEXT_COLOR) |
| 29 | if (which <= B_WINDOW_INACTIVE_BORDER_COLOR) |
30 | 30 | return which - 1; |
31 | 31 | if (which >= B_SUCCESS_COLOR && which <= B_FAILURE_COLOR) |
32 | | return which - B_SUCCESS_COLOR + B_WINDOW_INACTIVE_TEXT_COLOR; |
| 32 | return which - B_SUCCESS_COLOR + B_WINDOW_INACTIVE_BORDER_COLOR; |
33 | 33 | |
34 | 34 | return -1; |
35 | 35 | } |
… |
… |
static inline color_which
|
38 | 38 | index_to_color_which(int32 index) |
39 | 39 | { |
40 | 40 | if (index >= 0 && index < kNumColors) { |
41 | | if ((color_which)index < B_WINDOW_INACTIVE_TEXT_COLOR) |
| 41 | if ((color_which)index < B_WINDOW_INACTIVE_BORDER_COLOR) |
42 | 42 | return (color_which)(index + 1); |
43 | 43 | else |
44 | | return (color_which)(index + B_SUCCESS_COLOR - B_WINDOW_INACTIVE_TEXT_COLOR); |
| 44 | return (color_which)(index + B_SUCCESS_COLOR - B_WINDOW_INACTIVE_BORDER_COLOR); |
45 | 45 | } |
46 | 46 | |
47 | 47 | return (color_which)-1; |
diff --git src/bin/WindowShade.cpp src/bin/WindowShade.cpp
index 9b5bc31..dcca8d2 100644
|
|
static struct option const kLongOptions[] = {
|
63 | 63 | I(window_text_color, B_WINDOW_TEXT_COLOR), |
64 | 64 | I(window_inactive_tab_color, B_WINDOW_INACTIVE_TAB_COLOR), |
65 | 65 | I(window_inactive_text_color, B_WINDOW_INACTIVE_TEXT_COLOR), |
| 66 | I(window_border_color, B_WINDOW_BORDER_COLOR), |
| 67 | I(window_inactive_border_color, B_WINDOW_INACTIVE_BORDER_COLOR), |
66 | 68 | {"sum", required_argument, 0, 's'}, |
67 | 69 | {"refresh", no_argument, 0, 'r'}, |
68 | 70 | {"help", no_argument, 0, 'h'}, |
diff --git src/kits/interface/InterfaceDefs.cpp src/kits/interface/InterfaceDefs.cpp
index ed61c2f..1c53538 100644
|
|
static const rgb_color _kDefaultColors[kNumColors] = {
|
94 | 94 | {0, 0, 0, 255}, // B_WINDOW_TEXT_COLOR |
95 | 95 | {232, 232, 232, 255}, // B_WINDOW_INACTIVE_TAB_COLOR |
96 | 96 | {80, 80, 80, 255}, // B_WINDOW_INACTIVE_TEXT_COLOR |
| 97 | {224, 224, 224, 255}, // B_WINDOW_BORDER_COLOR |
| 98 | {232, 232, 232, 255}, // B_WINDOW_INACTIVE_BORDER_COLOR |
97 | 99 | // 100... |
98 | 100 | {0, 255, 0, 255}, // B_SUCCESS_COLOR |
99 | 101 | {255, 0, 0, 255}, // B_FAILURE_COLOR |
diff --git src/preferences/appearance/ColorSet.cpp src/preferences/appearance/ColorSet.cpp
index 653eba5..9840693 100644
|
|
static ColorDescription sColorDescriptionTable[] =
|
52 | 52 | { B_WINDOW_TEXT_COLOR, B_TRANSLATE_MARK("Window tab text") }, |
53 | 53 | { B_WINDOW_INACTIVE_TAB_COLOR, B_TRANSLATE_MARK("Inactive window tab") }, |
54 | 54 | { B_WINDOW_INACTIVE_TEXT_COLOR, |
55 | | B_TRANSLATE_MARK("Inactive window tab text") } |
| 55 | B_TRANSLATE_MARK("Inactive window tab text") }, |
| 56 | { B_WINDOW_BORDER_COLOR, B_TRANSLATE_MARK("Window border") }, |
| 57 | { B_WINDOW_INACTIVE_BORDER_COLOR, |
| 58 | B_TRANSLATE_MARK("Inactive window border") } |
56 | 59 | }; |
57 | 60 | |
58 | 61 | const int32 sColorDescriptionCount = sizeof(sColorDescriptionTable) |
… |
… |
ColorSet::DefaultColorSet(void)
|
134 | 137 | set.fColors[B_WINDOW_TEXT_COLOR] = make_color(0, 0, 0); |
135 | 138 | set.fColors[B_WINDOW_INACTIVE_TAB_COLOR] = make_color(232, 232, 232); |
136 | 139 | set.fColors[B_WINDOW_INACTIVE_TEXT_COLOR] = make_color(80, 80, 80); |
| 140 | set.fColors[B_WINDOW_BORDER_COLOR] = make_color(224, 224, 224); |
| 141 | set.fColors[B_WINDOW_INACTIVE_BORDER_COLOR] = make_color(232, 232, 232); |
137 | 142 | |
138 | 143 | return set; |
139 | 144 | } |
diff --git src/servers/app/WorkspacesView.cpp src/servers/app/WorkspacesView.cpp
index 76045b8..c20e12c 100644
|
|
|
15 | 15 | #include "Desktop.h" |
16 | 16 | #include "DrawingEngine.h" |
17 | 17 | #include "DrawState.h" |
| 18 | #include "InterfaceDefs.h" |
18 | 19 | #include "ServerApp.h" |
19 | 20 | #include "Window.h" |
20 | 21 | #include "Workspace.h" |
… |
… |
WorkspacesView::_WindowFrame(const BRect& workspaceFrame,
|
166 | 167 | void |
167 | 168 | WorkspacesView::_DrawWindow(DrawingEngine* drawingEngine, |
168 | 169 | const BRect& workspaceFrame, const BRect& screenFrame, ::Window* window, |
169 | | BPoint windowPosition, BRegion& backgroundRegion, bool active) |
| 170 | BPoint windowPosition, BRegion& backgroundRegion, bool workspaceActive) |
170 | 171 | { |
171 | 172 | if (window->Feel() == kDesktopWindowFeel || window->IsHidden()) |
172 | 173 | return; |
… |
… |
WorkspacesView::_DrawWindow(DrawingEngine* drawingEngine,
|
188 | 189 | rgb_color activeTabColor = (rgb_color){ 255, 203, 0, 255 }; |
189 | 190 | rgb_color inactiveTabColor = (rgb_color){ 232, 232, 232, 255 }; |
190 | 191 | rgb_color navColor = (rgb_color){ 0, 0, 229, 255 }; |
| 192 | rgb_color activeFrameColor = (rgb_color){ 180, 180, 180, 255 }; |
| 193 | rgb_color inactiveFrameColor = (rgb_color){ 180, 180, 180, 255 }; |
191 | 194 | if (decorator != NULL) { |
192 | 195 | activeTabColor = decorator->UIColor(B_WINDOW_TAB_COLOR); |
193 | 196 | inactiveTabColor = decorator->UIColor(B_WINDOW_INACTIVE_TAB_COLOR); |
194 | 197 | navColor = decorator->UIColor(B_NAVIGATION_BASE_COLOR); |
| 198 | activeFrameColor = decorator->UIColor(B_WINDOW_BORDER_COLOR); |
| 199 | inactiveFrameColor = decorator->UIColor(B_WINDOW_INACTIVE_BORDER_COLOR); |
195 | 200 | } |
196 | | // TODO: let decorator do this! |
197 | | rgb_color frameColor = (rgb_color){ 180, 180, 180, 255 }; |
| 201 | |
198 | 202 | rgb_color white = (rgb_color){ 255, 255, 255, 255 }; |
199 | 203 | |
200 | 204 | rgb_color tabColor = inactiveTabColor; |
201 | | if (window->IsFocus()) |
| 205 | rgb_color frameColor = inactiveFrameColor; |
| 206 | if (window->IsFocus()) { |
202 | 207 | tabColor = activeTabColor; |
| 208 | frameColor = activeFrameColor; |
| 209 | } |
203 | 210 | |
204 | | if (!active) { |
| 211 | if (!workspaceActive) { |
205 | 212 | _DarkenColor(tabColor); |
206 | 213 | _DarkenColor(frameColor); |
207 | 214 | _DarkenColor(white); |
208 | 215 | } |
209 | | if (window == fSelectedWindow) { |
210 | | frameColor = navColor; |
211 | | } |
212 | 216 | |
213 | 217 | if (tabFrame.left < frame.left) |
214 | 218 | tabFrame.left = frame.left; |
… |
… |
WorkspacesView::_DrawWorkspace(DrawingEngine* drawingEngine,
|
274 | 278 | BRect rect = _WorkspaceAt(index); |
275 | 279 | |
276 | 280 | Workspace workspace(*Window()->Desktop(), index); |
277 | | bool active = workspace.IsCurrent(); |
278 | | if (active) { |
| 281 | bool workspaceActive = workspace.IsCurrent(); |
| 282 | if (workspaceActive) { |
279 | 283 | // draw active frame |
280 | 284 | rgb_color black = (rgb_color){ 0, 0, 0, 255 }; |
281 | 285 | drawingEngine->StrokeRect(rect, black); |
… |
… |
WorkspacesView::_DrawWorkspace(DrawingEngine* drawingEngine,
|
287 | 291 | rect.InsetBy(1, 1); |
288 | 292 | |
289 | 293 | rgb_color color = workspace.Color(); |
290 | | if (!active) |
| 294 | if (!workspaceActive) |
291 | 295 | _DarkenColor(color); |
292 | 296 | |
293 | 297 | // draw windows |
… |
… |
WorkspacesView::_DrawWorkspace(DrawingEngine* drawingEngine,
|
317 | 321 | BPoint leftTop; |
318 | 322 | while (workspace.GetPreviousWindow(window, leftTop) == B_OK) { |
319 | 323 | _DrawWindow(drawingEngine, rect, screenFrame, window, |
320 | | leftTop, backgroundRegion, active); |
| 324 | leftTop, backgroundRegion, workspaceActive); |
321 | 325 | } |
322 | 326 | |
323 | 327 | // draw background |
diff --git src/servers/app/WorkspacesView.h src/servers/app/WorkspacesView.h
index a34b54a..179e6cb 100644
|
|
private:
|
45 | 45 | void _DrawWindow(DrawingEngine* drawingEngine, |
46 | 46 | const BRect& workspaceFrame, const BRect& screenFrame, |
47 | 47 | ::Window* window, BPoint windowPosition, |
48 | | BRegion& backgroundRegion, bool active); |
| 48 | BRegion& backgroundRegion, bool workspaceActive); |
49 | 49 | void _DrawWorkspace(DrawingEngine* drawingEngine, |
50 | 50 | BRegion& redraw, int32 index); |
51 | 51 | |
diff --git src/servers/app/decorator/DefaultDecorator.cpp src/servers/app/decorator/DefaultDecorator.cpp
index ea93151..05e693d 100644
|
|
const rgb_color DefaultDecorator::kFrameColors[4] = {
|
87 | 87 | { 108, 108, 108, 255 } |
88 | 88 | }; |
89 | 89 | |
90 | | const rgb_color DefaultDecorator::kFocusFrameColors[2] = { |
91 | | { 224, 224, 224, 255 }, |
92 | | { 208, 208, 208, 255 } |
93 | | }; |
94 | | |
95 | | const rgb_color DefaultDecorator::kNonFocusFrameColors[2] = { |
96 | | { 232, 232, 232, 255 }, |
97 | | { 232, 232, 232, 255 } |
98 | | }; |
99 | | |
100 | | |
101 | 90 | |
102 | 91 | // TODO: get rid of DesktopSettings here, and introduce private accessor |
103 | 92 | // methods to the Decorator base class |
… |
… |
DefaultDecorator::DefaultDecorator(DesktopSettings& settings, BRect rect)
|
105 | 94 | : |
106 | 95 | Decorator(settings, rect), |
107 | 96 | // focus color constants |
| 97 | kFocusFrameColor(settings.UIColor(B_WINDOW_BORDER_COLOR)), |
108 | 98 | kFocusTabColor(settings.UIColor(B_WINDOW_TAB_COLOR)), |
109 | 99 | kFocusTabColorLight(tint_color(kFocusTabColor, |
110 | 100 | (B_LIGHTEN_MAX_TINT + B_LIGHTEN_2_TINT) / 2)), |
… |
… |
DefaultDecorator::DefaultDecorator(DesktopSettings& settings, BRect rect)
|
113 | 103 | (B_DARKEN_1_TINT + B_NO_TINT) / 2)), |
114 | 104 | kFocusTextColor(settings.UIColor(B_WINDOW_TEXT_COLOR)), |
115 | 105 | // non-focus color constants |
| 106 | kNonFocusFrameColor(settings.UIColor(B_WINDOW_INACTIVE_BORDER_COLOR)), |
116 | 107 | kNonFocusTabColor(settings.UIColor(B_WINDOW_INACTIVE_TAB_COLOR)), |
117 | 108 | kNonFocusTabColorLight(tint_color(kNonFocusTabColor, |
118 | 109 | (B_LIGHTEN_MAX_TINT + B_LIGHTEN_2_TINT) / 2)), |
… |
… |
DefaultDecorator::TabLocation(int32 tab) const
|
143 | 134 | { |
144 | 135 | DefaultDecorator::Tab* decoratorTab = _TabAt(tab); |
145 | 136 | if (decoratorTab == NULL) |
146 | | return 0.; |
| 137 | return 0.0f; |
147 | 138 | return (float)decoratorTab->tabOffset; |
148 | 139 | } |
149 | 140 | |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
666 | 657 | // top |
667 | 658 | if (invalid.Intersects(fTopBorder)) { |
668 | 659 | ComponentColors colors; |
669 | | _GetComponentColors(COMPONENT_TOP_BORDER, colors); |
| 660 | _GetComponentColors(COMPONENT_TOP_BORDER, colors, fTopTab); |
670 | 661 | |
671 | 662 | for (int8 i = 0; i < 5; i++) { |
672 | 663 | fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
686 | 677 | // left |
687 | 678 | if (invalid.Intersects(fLeftBorder.InsetByCopy(0, -fBorderWidth))) { |
688 | 679 | ComponentColors colors; |
689 | | _GetComponentColors(COMPONENT_LEFT_BORDER, colors); |
| 680 | _GetComponentColors(COMPONENT_LEFT_BORDER, colors, fTopTab); |
690 | 681 | |
691 | 682 | for (int8 i = 0; i < 5; i++) { |
692 | 683 | fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
696 | 687 | // bottom |
697 | 688 | if (invalid.Intersects(fBottomBorder)) { |
698 | 689 | ComponentColors colors; |
699 | | _GetComponentColors(COMPONENT_BOTTOM_BORDER, colors); |
| 690 | _GetComponentColors(COMPONENT_BOTTOM_BORDER, colors, fTopTab); |
700 | 691 | |
701 | 692 | for (int8 i = 0; i < 5; i++) { |
702 | 693 | fDrawingEngine->StrokeLine(BPoint(r.left + i, r.bottom - i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
707 | 698 | // right |
708 | 699 | if (invalid.Intersects(fRightBorder.InsetByCopy(0, -fBorderWidth))) { |
709 | 700 | ComponentColors colors; |
710 | | _GetComponentColors(COMPONENT_RIGHT_BORDER, colors); |
| 701 | _GetComponentColors(COMPONENT_RIGHT_BORDER, colors, fTopTab); |
711 | 702 | |
712 | 703 | for (int8 i = 0; i < 5; i++) { |
713 | 704 | fDrawingEngine->StrokeLine(BPoint(r.right - i, r.top + i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
724 | 715 | // top |
725 | 716 | if (invalid.Intersects(fTopBorder)) { |
726 | 717 | ComponentColors colors; |
727 | | _GetComponentColors(COMPONENT_TOP_BORDER, colors); |
| 718 | _GetComponentColors(COMPONENT_TOP_BORDER, colors, fTopTab); |
728 | 719 | |
729 | 720 | for (int8 i = 0; i < 3; i++) { |
730 | 721 | fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
744 | 735 | // left |
745 | 736 | if (invalid.Intersects(fLeftBorder.InsetByCopy(0, -fBorderWidth))) { |
746 | 737 | ComponentColors colors; |
747 | | _GetComponentColors(COMPONENT_LEFT_BORDER, colors); |
| 738 | _GetComponentColors(COMPONENT_LEFT_BORDER, colors, fTopTab); |
748 | 739 | |
749 | 740 | for (int8 i = 0; i < 3; i++) { |
750 | 741 | fDrawingEngine->StrokeLine(BPoint(r.left + i, r.top + i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
764 | 755 | // bottom |
765 | 756 | if (invalid.Intersects(fBottomBorder)) { |
766 | 757 | ComponentColors colors; |
767 | | _GetComponentColors(COMPONENT_BOTTOM_BORDER, colors); |
| 758 | _GetComponentColors(COMPONENT_BOTTOM_BORDER, colors, fTopTab); |
768 | 759 | |
769 | 760 | for (int8 i = 0; i < 3; i++) { |
770 | 761 | fDrawingEngine->StrokeLine(BPoint(r.left + i, r.bottom - i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
775 | 766 | // right |
776 | 767 | if (invalid.Intersects(fRightBorder.InsetByCopy(0, -fBorderWidth))) { |
777 | 768 | ComponentColors colors; |
778 | | _GetComponentColors(COMPONENT_RIGHT_BORDER, colors); |
| 769 | _GetComponentColors(COMPONENT_RIGHT_BORDER, colors, fTopTab); |
779 | 770 | |
780 | 771 | for (int8 i = 0; i < 3; i++) { |
781 | 772 | fDrawingEngine->StrokeLine(BPoint(r.right - i, r.top + i), |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
790 | 781 | { |
791 | 782 | // TODO: Draw the borders individually! |
792 | 783 | ComponentColors colors; |
793 | | _GetComponentColors(COMPONENT_LEFT_BORDER, colors); |
| 784 | _GetComponentColors(COMPONENT_LEFT_BORDER, colors, fTopTab); |
794 | 785 | |
795 | 786 | fDrawingEngine->StrokeRect(r, colors[5]); |
796 | 787 | break; |
… |
… |
DefaultDecorator::_DrawFrame(BRect invalid)
|
806 | 797 | r = fResizeRect; |
807 | 798 | |
808 | 799 | ComponentColors colors; |
809 | | _GetComponentColors(COMPONENT_RESIZE_CORNER, colors); |
| 800 | _GetComponentColors(COMPONENT_RESIZE_CORNER, colors, fTopTab); |
810 | 801 | |
811 | 802 | switch ((int)fTopTab->look) { |
812 | 803 | case B_DOCUMENT_WINDOW_LOOK: |
… |
… |
DefaultDecorator::GetComponentColors(Component component, uint8 highlight,
|
1499 | 1490 | DefaultDecorator::Tab* tab = static_cast<DefaultDecorator::Tab*>(_tab); |
1500 | 1491 | switch (component) { |
1501 | 1492 | case COMPONENT_TAB: |
1502 | | _colors[COLOR_TAB_FRAME_LIGHT] = kFrameColors[0]; |
1503 | | _colors[COLOR_TAB_FRAME_DARK] = kFrameColors[3]; |
| 1493 | _colors[COLOR_TAB_FRAME_LIGHT] |
| 1494 | = tint_color(kFocusFrameColor, B_DARKEN_2_TINT); |
| 1495 | _colors[COLOR_TAB_FRAME_DARK] |
| 1496 | = tint_color(kFocusFrameColor, B_DARKEN_3_TINT); |
1504 | 1497 | if (tab && tab->buttonFocus) { |
1505 | 1498 | _colors[COLOR_TAB] = kFocusTabColor; |
1506 | 1499 | _colors[COLOR_TAB_LIGHT] = kFocusTabColorLight; |
… |
… |
DefaultDecorator::GetComponentColors(Component component, uint8 highlight,
|
1533 | 1526 | case COMPONENT_BOTTOM_BORDER: |
1534 | 1527 | case COMPONENT_RESIZE_CORNER: |
1535 | 1528 | default: |
1536 | | _colors[0] = kFrameColors[0]; |
1537 | | _colors[1] = kFrameColors[1]; |
1538 | 1529 | if (tab && tab->buttonFocus) { |
1539 | | _colors[2] = kFocusFrameColors[0]; |
1540 | | _colors[3] = kFocusFrameColors[1]; |
| 1530 | _colors[0] = tint_color(kFocusFrameColor, B_DARKEN_2_TINT); |
| 1531 | _colors[1] = tint_color(kFocusFrameColor, B_LIGHTEN_2_TINT); |
| 1532 | _colors[2] = kFocusFrameColor; |
| 1533 | _colors[3] = tint_color(kFocusFrameColor, |
| 1534 | (B_DARKEN_1_TINT + B_NO_TINT) / 2); |
| 1535 | _colors[4] = tint_color(kFocusFrameColor, B_DARKEN_2_TINT); |
| 1536 | _colors[5] = tint_color(kFocusFrameColor, B_DARKEN_3_TINT); |
1541 | 1537 | } else { |
1542 | | _colors[2] = kNonFocusFrameColors[0]; |
1543 | | _colors[3] = kNonFocusFrameColors[1]; |
| 1538 | _colors[0] = tint_color(kNonFocusFrameColor, B_DARKEN_2_TINT); |
| 1539 | _colors[1] = tint_color(kNonFocusFrameColor, B_LIGHTEN_2_TINT); |
| 1540 | _colors[2] = kNonFocusFrameColor; |
| 1541 | _colors[3] = tint_color(kNonFocusFrameColor, |
| 1542 | (B_DARKEN_1_TINT + B_NO_TINT) / 2); |
| 1543 | _colors[4] = tint_color(kNonFocusFrameColor, B_DARKEN_2_TINT); |
| 1544 | _colors[5] = tint_color(kNonFocusFrameColor, B_DARKEN_3_TINT); |
1544 | 1545 | } |
1545 | | _colors[4] = kFrameColors[2]; |
1546 | | _colors[5] = kFrameColors[3]; |
1547 | 1546 | |
1548 | 1547 | // for the resize-border highlight dye everything bluish. |
1549 | 1548 | if (highlight == HIGHLIGHT_RESIZE_BORDER) { |
diff --git src/servers/app/decorator/DefaultDecorator.h src/servers/app/decorator/DefaultDecorator.h
index 89fd663..7f46309 100644
|
|
private:
|
186 | 186 | void _CalculateTabsRegion(); |
187 | 187 | protected: |
188 | 188 | static const rgb_color kFrameColors[4]; |
189 | | static const rgb_color kFocusFrameColors[2]; |
190 | | static const rgb_color kNonFocusFrameColors[2]; |
| 189 | |
| 190 | const rgb_color kFocusFrameColor; |
191 | 191 | |
192 | 192 | const rgb_color kFocusTabColor; |
193 | 193 | const rgb_color kFocusTabColorLight; |
… |
… |
protected:
|
195 | 195 | const rgb_color kFocusTabColorShadow; |
196 | 196 | const rgb_color kFocusTextColor; |
197 | 197 | |
| 198 | const rgb_color kNonFocusFrameColor; |
| 199 | |
198 | 200 | const rgb_color kNonFocusTabColor; |
199 | 201 | const rgb_color kNonFocusTabColorLight; |
200 | 202 | const rgb_color kNonFocusTabColorBevel; |