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

only lock after checking the other conditions. Also changed iteration

Browse Source 
to remove menu items with a single RemoveItems() call. Axel, I hope you 
don't mind.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19600 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-12-22 07:34:05 +00:00
parent 9710088cc3
commit 6e194a72e7
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/WindowMenu.cpp
+5 -9
View File
@@ -81,9 +81,7 @@ TWindowMenu::AttachedToWindow()
{ {
SetFont(be_plain_font); SetFont(be_plain_font);
BMenuItem *item = NULL; RemoveItems(0, CountItems(), true);
while ((item = RemoveItem((int32)0)) != NULL)
delete (item);
int32 miniCount = 0; int32 miniCount = 0;
@@ -212,12 +210,10 @@ TWindowMenu::DetachedFromWindow()
// in expando mode the teammenu will not call DragStop, // in expando mode the teammenu will not call DragStop,
// thus, it needs to be called from here // thus, it needs to be called from here
TBarView *barview = (dynamic_cast<TBarApp*>(be_app))->BarView(); TBarView *barview = (dynamic_cast<TBarApp*>(be_app))->BarView();
if (barview && barview->LockLooper()) { if (barview && barview->Expando() && barview->Dragging() && barview->LockLooper()) {
if (barview->Expando() && barview->Dragging()) { // We changed the show level in AttachedToWindow(). Undo it.
// We changed the show level in AttachedToWindow(). Undo it. Window()->Show();
Window()->Show(); barview->DragStop();
barview->DragStop();
}
barview->UnlockLooper(); barview->UnlockLooper();
} }