Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use the border highlight colors for the tab frame. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39635 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-11-25 22:32:37 +00:00
parent 06d8bb6f83
commit ad1100115a
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/add-ons/decorators/SATDecorator/SATDecorator.cpp
View File

@ -105,8 +105,6 @@ SATDecorator::HighlightTab(bool active, BRegion* dirty)
void void
SATDecorator::HighlightBorders(bool active, BRegion* dirty) SATDecorator::HighlightBorders(bool active, BRegion* dirty)
{ {
dirty->Include(fTabRect);
// for the frame lines
dirty->Include(fLeftBorder); dirty->Include(fLeftBorder);
dirty->Include(fRightBorder); dirty->Include(fRightBorder);
dirty->Include(fTopBorder); dirty->Include(fTopBorder);
@ -458,33 +456,18 @@ SATDecorator::GetComponentColors(Region component, ComponentColors _colors)
{ {
switch (component) { switch (component) {
case REGION_TAB: case REGION_TAB:
if (fBordersHighlighted) { if (!fTabHighlighted) {
_colors[COLOR_TAB_FRAME_LIGHT] = kHighlightFrameColors[0]; DefaultDecorator::GetComponentColors(component, _colors);
_colors[COLOR_TAB_FRAME_DARK] = kHighlightFrameColors[5]; return;
} else {
_colors[COLOR_TAB_FRAME_LIGHT] = kFrameColors[0];
_colors[COLOR_TAB_FRAME_DARK] = kFrameColors[3];
} }
if (fTabHighlighted) { _colors[COLOR_TAB_FRAME_LIGHT] = kFrameColors[0];
_colors[COLOR_TAB] = kHighlightTabColor; _colors[COLOR_TAB_FRAME_DARK] = kFrameColors[3];
_colors[COLOR_TAB_LIGHT] = kHighlightTabColorLight; _colors[COLOR_TAB] = kHighlightTabColor;
_colors[COLOR_TAB_BEVEL] = kHighlightTabColorBevel; _colors[COLOR_TAB_LIGHT] = kHighlightTabColorLight;
_colors[COLOR_TAB_SHADOW] = kHighlightTabColorShadow; _colors[COLOR_TAB_BEVEL] = kHighlightTabColorBevel;
_colors[COLOR_TAB_TEXT] = kFocusTextColor; _colors[COLOR_TAB_SHADOW] = kHighlightTabColorShadow;
} else if (fButtonFocus) { _colors[COLOR_TAB_TEXT] = kFocusTextColor;
_colors[COLOR_TAB] = kFocusTabColor;
_colors[COLOR_TAB_LIGHT] = kFocusTabColorLight;
_colors[COLOR_TAB_BEVEL] = kFocusTabColorBevel;
_colors[COLOR_TAB_SHADOW] = kFocusTabColorShadow;
_colors[COLOR_TAB_TEXT] = kFocusTextColor;
} else {
_colors[COLOR_TAB] = kNonFocusTabColor;
_colors[COLOR_TAB_LIGHT] = kNonFocusTabColorLight;
_colors[COLOR_TAB_BEVEL] = kNonFocusTabColorBevel;
_colors[COLOR_TAB_SHADOW] = kNonFocusTabColorShadow;
_colors[COLOR_TAB_TEXT] = kNonFocusTextColor;
}
break; break;
case REGION_LEFT_BORDER: case REGION_LEFT_BORDER: