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

Fixed focus line drawing to draw the white underline and to not draw the focus line if the window containing the button is not active.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10978 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matthew Wilber 2005-01-23 15:46:43 +00:00
parent c36b4a4409
commit 33413e498b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/kits/interface/Button.cpp
View File

@ -98,14 +98,20 @@ void BButton::Draw(BRect updateRect)
{ {
float x = (bounds.right - StringWidth(Label())) / 2.0f; float x = (bounds.right - StringWidth(Label())) / 2.0f;
float y = bounds.top + ((bounds.Height() - fh.ascent - fh.descent) / 2.0f) + fh.ascent + fh.descent + 1; float y = bounds.top + ((bounds.Height() - fh.ascent - fh.descent) / 2.0f) + fh.ascent + fh.descent + 1;
if (IsFocus()) bool bDrawFocusLine = IsFocus() && Window()->IsActive();
if (bDrawFocusLine)
SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR)); SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
else else
SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
B_LIGHTEN_1_TINT)); B_LIGHTEN_1_TINT));
// Blue Line
StrokeLine(BPoint(x, y), BPoint(x + StringWidth(Label()), y)); StrokeLine(BPoint(x, y), BPoint(x + StringWidth(Label()), y));
if (bDrawFocusLine)
SetHighColor(255, 255, 255);
// White Line
StrokeLine(BPoint(x, y + 1), BPoint(x + StringWidth(Label()), y + 1));
return; return;
} }
@ -203,12 +209,15 @@ void BButton::Draw(BRect updateRect)
DrawString(Label(), BPoint(x, y)); DrawString(Label(), BPoint(x, y));
// Focus if (IsFocus() && Window()->IsActive())
if (IsFocus())
{ {
// Draw focus line
y += fh.descent; y += fh.descent;
SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR)); SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
StrokeLine(BPoint(x, y), BPoint(x + StringWidth(Label()), y)); StrokeLine(BPoint(x, y), BPoint(x + StringWidth(Label()), y));
SetHighColor(255, 255, 255);
StrokeLine(BPoint(x, y + 1), BPoint(x + StringWidth(Label()), y + 1));
} }
} }
else else
@ -270,6 +279,7 @@ void BButton::Draw(BRect updateRect)
DrawString(Label(), BPoint(x, y)); DrawString(Label(), BPoint(x, y));
} }
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void BButton::MouseDown(BPoint point) void BButton::MouseDown(BPoint point)
{ {