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

Make BMenuBar background drawing more flexible and also support an "activated"

Browse Source 
state.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29597 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-03-18 17:18:06 +00:00
parent 4bbbead0bd
commit 1a72cb4139
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/os/interface/ControlLook.h
View File

@ -78,6 +78,7 @@ public:
virtual void DrawMenuBarBackground(BView* view, BRect& rect, virtual void DrawMenuBarBackground(BView* view, BRect& rect,
const BRect& updateRect, const BRect& updateRect,
const rgb_color& base, const rgb_color& base,
uint32 flags = 0,
uint32 borders = B_ALL_BORDERS); uint32 borders = B_ALL_BORDERS);
virtual void DrawMenuFieldFrame(BView* view, BRect& rect, virtual void DrawMenuFieldFrame(BView* view, BRect& rect,

43
src/kits/interface/ControlLook.cpp
View File

@ -174,7 +174,8 @@ BControlLook::DrawButtonBackground(BView* view, BRect& rect,
void void
BControlLook::DrawMenuBarBackground(BView* view, BRect& rect, BControlLook::DrawMenuBarBackground(BView* view, BRect& rect,
const BRect& updateRect, const rgb_color& base, uint32 borders) const BRect& updateRect, const rgb_color& base, uint32 flags,
uint32 borders)
{ {
if (!rect.IsValid() || !updateRect.Intersects(rect)) if (!rect.IsValid() || !updateRect.Intersects(rect))
return; return;
@ -182,22 +183,38 @@ BControlLook::DrawMenuBarBackground(BView* view, BRect& rect,
// the surface edges // the surface edges
// colors // colors
rgb_color cornerColor = tint_color(base, 0.9); float topTint;
rgb_color bevelColor1 = tint_color(base, 0.5); float bottomTint;
rgb_color bevelColor2 = tint_color(base, 0.7);
rgb_color bevelColor3 = tint_color(base, 1.08);
_DrawFrame(view, rect, if (flags & B_ACTIVATED) {
bevelColor2, bevelColor1, rgb_color bevelColor1 = tint_color(base, 1.40);
bevelColor3, bevelColor3, rgb_color bevelColor2 = tint_color(base, 1.25);
cornerColor, cornerColor,
borders); topTint = 1.25;
bottomTint = 1.20;
_DrawFrame(view, rect,
bevelColor1, bevelColor1,
bevelColor2, bevelColor2,
borders & B_TOP_BORDER);
} else {
rgb_color cornerColor = tint_color(base, 0.9);
rgb_color bevelColorTop = tint_color(base, 0.5);
rgb_color bevelColorLeft = tint_color(base, 0.7);
rgb_color bevelColorRightBottom = tint_color(base, 1.08);
topTint = 0.69;
bottomTint = 1.03;
_DrawFrame(view, rect,
bevelColorLeft, bevelColorTop,
bevelColorRightBottom, bevelColorRightBottom,
cornerColor, cornerColor,
borders);
}
// the actual surface top // the actual surface top
float topTint = 0.69;
float bottomTint = 1.03;
_FillGradient(view, rect, base, topTint, bottomTint); _FillGradient(view, rect, base, topTint, bottomTint);
} }