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

Fixed vlc menubars

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16975 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-04-02 22:31:04 +00:00
parent a2b0a7ac3e
commit e90bed06b1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kits/interface/Menu.cpp
View File

@ -961,7 +961,7 @@ BMenu::Track(bool openAnyway, BRect *clickToOpenRect)
SetStickyMode(openAnyway);
if (LockLooper()) {
if (openAnyway && LockLooper()) {
RedrawAfterSticky(Bounds());
UnlockLooper();
}
@ -1242,11 +1242,11 @@ BMenu::_AddItem(BMenuItem *item, int32 index)
item->Install(window);
// Make sure we update the layout if needed.
if (fResizeToFit) {
//if (fResizeToFit) {
LayoutItems(index);
//UpdateWindowViewSize();
Invalidate();
}
//}
window->Unlock();
}
@ -1303,7 +1303,7 @@ BMenu::RemoveItems(int32 index, int32 count, BMenuItem *item, bool deleteItems)
}
}
if (invalidateLayout && locked && fResizeToFit) {
if (invalidateLayout && locked /*&& fResizeToFit*/) {
LayoutItems(0);
Invalidate();
}
@ -1321,7 +1321,7 @@ BMenu::LayoutItems(int32 index)
CalcTriggers();
float width, height;
ComputeLayout(index, true, true, &width, &height);
ComputeLayout(index, fResizeToFit, true, &width, &height);
ResizeTo(width, height);

5
src/kits/interface/MenuBar.cpp
View File

@ -70,7 +70,7 @@ BMenuBar::BMenuBar(BMessage *data)
BMenuBar::~BMenuBar()
{
if (fTrackingPID >= 0) {
if (fTracking) {
status_t dummy;
wait_for_thread(fTrackingPID, &dummy);
}
@ -174,6 +174,9 @@ BMenuBar::MessageReceived(BMessage *msg)
void
BMenuBar::MouseDown(BPoint where)
{
if (fTracking)
return;
BWindow *window = Window();
if (!window->IsActive() || !window->IsFront()) {
window->Activate();