diff --git a/src/apps/deskbar/WindowMenuItem.cpp b/src/apps/deskbar/WindowMenuItem.cpp
index ddf94f4..3e23585 100644
a
|
b
|
Except as contained in this notice, the name of Be Incorporated shall not be
|
26 | 26 | used in advertising or otherwise to promote the sale, use or other dealings in |
27 | 27 | this Software without prior written authorization from Be Incorporated. |
28 | 28 | |
29 | | Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks |
30 | | of Be Incorporated in the United States and other countries. Other brand product |
31 | | names are registered trademarks or trademarks of their respective holders. |
| 29 | Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered |
| 30 | trademarks of Be Incorporated in the United States and other countries. Other |
| 31 | brand product names are registered trademarks or trademarks of their respective |
| 32 | holders. |
32 | 33 | All rights reserved. |
33 | 34 | */ |
34 | 35 | |
… |
… |
All rights reserved.
|
48 | 49 | #include "WindowMenu.h" |
49 | 50 | |
50 | 51 | |
51 | | const float kHPad = 10.0f; |
52 | | const float kVPad = 2.0f; |
53 | | const float kLabelOffset = 8.0f; |
54 | | const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f); |
| 52 | const float kHPad = 10.0f; |
| 53 | const float kVPad = 2.0f; |
| 54 | const float kLabelOffset = 8.0f; |
| 55 | const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f); |
55 | 56 | |
56 | 57 | |
57 | 58 | TWindowMenuItem::TWindowMenuItem(const char* title, int32 id, bool mini, |
… |
… |
void
|
75 | 76 | TWindowMenuItem::Initialize(const char* title) |
76 | 77 | { |
77 | 78 | if (fMini) { |
78 | | fBitmap = fCurrentWorkSpace |
| 79 | fBitmap = fCurrentWorkSpace |
79 | 80 | ? AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowHiddenIcon) |
80 | 81 | : AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowHiddenSwitchIcon); |
81 | 82 | } else { |
82 | | fBitmap = fCurrentWorkSpace |
| 83 | fBitmap = fCurrentWorkSpace |
83 | 84 | ? AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowShownIcon) |
84 | 85 | : AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowShownSwitchIcon); |
85 | 86 | } |
… |
… |
TWindowMenuItem::Draw()
|
204 | 205 | |
205 | 206 | menu->PushState(); |
206 | 207 | |
207 | | // if not selected or being tracked on, fill with gray |
| 208 | // if not selected or being tracked on, fill with gray |
208 | 209 | TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView(); |
209 | 210 | if ((!IsSelected() && !menu->IsRedrawAfterSticky()) |
210 | 211 | || barview->Dragging() || !IsEnabled()) { |
… |
… |
TWindowMenuItem::DrawContent()
|
241 | 242 | |
242 | 243 | BRect frame(Frame()); |
243 | 244 | BPoint contLoc = ContentLocation() + BPoint(kHPad, kVPad); |
244 | | // if (fExpanded) |
245 | | // contLoc.x += kHPad; |
| 245 | //if (fExpanded) |
| 246 | // contLoc.x += kHPad; |
246 | 247 | |
247 | 248 | if (fID >= 0) { |
248 | 249 | menu->SetDrawingMode(B_OP_OVER); |