i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed drawing, again

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1638 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marc Flerackers
2002-10-25 07:25:50 +00:00
parent 259a6f747a
commit bf1b4e2926
1 changed files with 109 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Button.cpp
+109 -145
View File
@@ -100,182 +100,146 @@ void BButton::Draw(BRect updateRect)
if (IsEnabled()) if (IsEnabled())
{ {
// This can be set outside draw
SetHighColor(darken4);
// Dark border
StrokeRect(rect);
BeginLineArray(8);
// Corners
AddLine(rect.LeftBottom(), rect.LeftBottom(), no_tint);
AddLine(rect.LeftTop(), rect.LeftTop(), no_tint);
AddLine(rect.RightTop(), rect.RightTop(), no_tint);
AddLine(rect.RightBottom(), rect.RightBottom(), no_tint);
rect.InsetBy(1, 1);
// First bevel
AddLine(BPoint(rect.left + 1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), darken2);
AddLine(BPoint(rect.right, rect.bottom - 1.0f),
BPoint(rect.right, rect.top + 1.0f), darken2);
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lighten1);
AddLine(BPoint(rect.left + 1.0f, rect.top),
BPoint(rect.right, rect.top), lighten1);
EndLineArray();
rect.InsetBy(1, 1);
// Second bevel
SetHighColor(lightenmax);
FillRect(rect);
SetHighColor(no_tint);
StrokeLine(BPoint(rect.right, rect.top + 1.0f),
BPoint(rect.right, rect.bottom));
StrokeLine(BPoint(rect.left + 1.0f, rect.bottom));
rect.InsetBy(1, 1);
// Filling
rect.left += 1.0f;
rect.top += 1.0f;
SetHighColor(lighten1);
FillRect(rect);
if (Value()) if (Value())
{ {
BeginLineArray(8); // Invert
rect.left -= 3;
// Dark border rect.top -= 3;
AddLine(BPoint(rect.left, rect.bottom-1.0f), rect.right += 2;
BPoint(rect.left, rect.top+1.0f), darken4); rect.bottom += 2;
AddLine(BPoint(rect.left+1.0f, rect.top), SetDrawingMode(B_OP_INVERT);
BPoint(rect.right-1.0f, rect.top), darken4); SetHighColor(0, 0, 0);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right-1.0f, rect.bottom), darken4);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), darken4);
rect.InsetBy(1,1);
// First bevel
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), darkenmax);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right, rect.top), darkenmax);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), darken4);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), darken4);
EndLineArray();
rect.InsetBy(1,1);
// Filling
SetHighColor(darkenmax);
FillRect(rect); FillRect(rect);
SetDrawingMode(B_OP_COPY);
}
// Label // Label
BFont font; BFont font;
GetFont(&font); GetFont(&font);
float x = Bounds().Width() / 2 - StringWidth(Label()) / 2.0f; float x = Bounds().Width() / 2 - StringWidth(Label()) / 2.0f;
float y = Bounds().Height() / 2.0f + (float)ceil(font.Size() / 2.0f); float y = Bounds().Height() / 2.0f + (float)ceil(font.Size() / 2.0f);
if (Value())
{
SetHighColor(lightenmax); SetHighColor(lightenmax);
SetLowColor(darkenmax); SetLowColor(darkenmax);
DrawString(Label(), BPoint(x, y));
} }
else else
{ {
BeginLineArray(14);
// Dark border
AddLine(BPoint(rect.left, rect.bottom-1.0f),
BPoint(rect.left, rect.top+1.0f), darken4);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right-1.0f, rect.top), darken4);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right-1.0f, rect.bottom), darken4);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), darken4);
rect.InsetBy(1,1);
// First bevel
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lighten1);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right, rect.top), lighten1);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), darken2);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), darken2);
rect.InsetBy(1,1);
// Second bevel
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lightenmax);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right, rect.top), lightenmax);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), no_tint);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), no_tint);
rect.InsetBy(1,1);
// Third bevel
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lightenmax);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right, rect.top), lightenmax);
EndLineArray();
rect.left +=1;
rect.top += 1;
// Filling
SetHighColor(lighten2);
FillRect(rect);
// Label
BFont font;
GetFont(&font);
float x = Bounds().Width() / 2 - StringWidth(Label()) / 2.0f;
float y = Bounds().Height() / 2.0f + (float)ceil(font.Size() / 2.0f);
SetHighColor(darkenmax); SetHighColor(darkenmax);
SetLowColor(lighten2); SetLowColor(lighten2);
DrawString(Label(), BPoint(x, y)); }
// Focus
if (IsFocus())
{
font_height fh;
font.GetHeight(&fh);
y += 2.0f; DrawString(Label(), BPoint(x, y));
SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
StrokeLine(BPoint(x, y), BPoint(x + StringWidth(Label()), y)); // Focus
} if (IsFocus())
{
font_height fh;
font.GetHeight(&fh);
y += 2.0f;
SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
StrokeLine(BPoint(x, y), BPoint(x + StringWidth(Label()), y));
} }
} }
else else
{ {
BeginLineArray(14); // This can be set outside draw
SetHighColor(darken2);
// Dark border // Dark border
AddLine(BPoint(rect.left, rect.bottom-1.0f), StrokeRect(rect);
BPoint(rect.left, rect.top+1.0f), darken2);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right-1.0f, rect.top), darken2);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right-1.0f, rect.bottom), darken2);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), darken2);
rect.InsetBy(1,1); BeginLineArray(8);
// Corners
AddLine(rect.LeftBottom(), rect.LeftBottom(), no_tint);
AddLine(rect.LeftTop(), rect.LeftTop(), no_tint);
AddLine(rect.RightTop(), rect.RightTop(), no_tint);
AddLine(rect.RightBottom(), rect.RightBottom(), no_tint);
rect.InsetBy(1, 1);
// First bevel // First bevel
AddLine(BPoint(rect.left + 1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), no_tint);
AddLine(BPoint(rect.right, rect.bottom - 1.0f),
BPoint(rect.right, rect.top + 1.0f), no_tint);
AddLine(BPoint(rect.left, rect.top), AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lighten1); BPoint(rect.left, rect.bottom), lighten1);
AddLine(BPoint(rect.left+1.0f, rect.top), AddLine(BPoint(rect.left + 1.0f, rect.top),
BPoint(rect.right, rect.top), lighten1); BPoint(rect.right, rect.top), lighten1);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), no_tint);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), no_tint);
rect.InsetBy(1,1);
// Second bevel
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lightenmax);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right, rect.top), lightenmax);
AddLine(BPoint(rect.left+1.0f, rect.bottom),
BPoint(rect.right, rect.bottom), no_tint);
AddLine(BPoint(rect.right, rect.bottom-1.0f),
BPoint(rect.right, rect.top+1.0f), no_tint);
rect.InsetBy(1,1);
// Third bevel
AddLine(BPoint(rect.left, rect.top),
BPoint(rect.left, rect.bottom), lightenmax);
AddLine(BPoint(rect.left+1.0f, rect.top),
BPoint(rect.right, rect.top), lightenmax);
EndLineArray(); EndLineArray();
rect.left +=1; rect.InsetBy(1, 1);
rect.top += 1;
// Second bevel
SetHighColor(lightenmax);
FillRect(rect);
SetHighColor(no_tint);
StrokeLine(BPoint(rect.right, rect.top + 1.0f),
BPoint(rect.right, rect.bottom));
StrokeLine(BPoint(rect.left + 1.0f, rect.bottom));
rect.InsetBy(1, 1);
// Filling // Filling
SetHighColor(lighten2); rect.left += 1.0f;
rect.top += 1.0f;
SetHighColor(lighten1);
FillRect(rect); FillRect(rect);
// Label // Label