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

Implemented enhencement ticket #4799.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33629 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-10-17 22:46:27 +00:00
parent 0ccd8732ac
commit 2a5ee87029
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/WindowMenuItem.cpp
+36 -34
View File
@@ -170,41 +170,43 @@ TWindowMenuItem::GetContentSize(float* width, float* height)
void void
TWindowMenuItem::Draw() TWindowMenuItem::Draw()
{ {
if (fExpanded) { if (!fExpanded) {
rgb_color menuColor = Menu()->ViewColor();
BRect frame(Frame());
BMenu* menu = Menu();
menu->PushState();
// if not selected or being tracked on, fill with gray
TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
if (!IsSelected() && !menu->IsRedrawAfterSticky()
|| barview->Dragging() || !IsEnabled()) {
menu->SetHighColor(menuColor);
menu->FillRect(frame);
if (fExpanded) {
rgb_color shadow = tint_color(menuColor,
(B_NO_TINT + B_DARKEN_1_TINT) / 2.0f);
menu->SetHighColor(shadow);
frame.right = frame.left + kHPad / 2;
menu->FillRect(frame);
}
}
if (IsEnabled() && IsSelected() && !menu->IsRedrawAfterSticky()) {
// fill
menu->SetHighColor(tint_color(menuColor,
B_HIGHLIGHT_BACKGROUND_TINT));
menu->FillRect(frame);
} else
menu->SetLowColor(menuColor);
DrawContent();
menu->PopState();
} else
BMenuItem::Draw(); BMenuItem::Draw();
return;
}
rgb_color menuColor = tint_color(Menu()->ViewColor(), 1.07);
BRect frame(Frame());
BMenu* menu = Menu();
menu->PushState();
// if not selected or being tracked on, fill with gray
TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
if (!IsSelected() && !menu->IsRedrawAfterSticky()
|| barview->Dragging() || !IsEnabled()) {
rgb_color shadow = tint_color(menuColor, 1.09);
menu->SetHighColor(shadow);
frame.right = frame.left + kHPad / 2;
menu->FillRect(frame);
menu->SetHighColor(menuColor);
frame.left = frame.right + 1;
frame.right = Frame().right;
menu->FillRect(frame);
}
if (IsEnabled() && IsSelected() && !menu->IsRedrawAfterSticky()) {
// fill
menu->SetHighColor(tint_color(menuColor,
B_HIGHLIGHT_BACKGROUND_TINT));
menu->FillRect(frame);
} else
menu->SetLowColor(menuColor);
DrawContent();
menu->PopState();
} }