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

Need to SaveExpandedState() before rebuilding items.

Browse Source 
Also, if mini-mode we can skip updating the view because it doesn't get drawn
until you click the TeamMenu expander.
This commit is contained in:
John Scipione
2013-04-14 14:05:29 -04:00
parent f2e15d076c
commit 753d86ac84
1 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/BarApp.cpp
+56 -29
View File
@@ -466,10 +466,12 @@ TBarApp::MessageReceived(BMessage* message)
case kAlwaysTop:
fSettings.alwaysOnTop = !fSettings.alwaysOnTop;
fBarWindow->SetFeel(fSettings.alwaysOnTop ?
B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL);
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
fBarWindow->SetFeel(fSettings.alwaysOnTop ?
B_FLOATING_ALL_WINDOW_FEEL : B_NORMAL_WINDOW_FEEL);
break;
case kAutoRaise:
@@ -483,34 +485,44 @@ TBarApp::MessageReceived(BMessage* message)
case kAutoHide:
fSettings.autoHide = !fSettings.autoHide;
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
fBarWindow->Lock();
fBarView->HideDeskbar(fSettings.autoHide);
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
break;
case kTrackerFirst:
fSettings.trackerAlwaysFirst = !fSettings.trackerAlwaysFirst;
fBarWindow->Lock();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
// if mini mode we don't need to update the view
if (fBarView->MiniState())
break;
fBarWindow->Lock();
fBarView->SaveExpandedItems();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
break;
case kSortRunningApps:
fSettings.sortRunningApps = !fSettings.sortRunningApps;
fBarWindow->Lock();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
// if mini mode we don't need to update the view
if (fBarView->MiniState())
break;
fBarWindow->Lock();
fBarView->SaveExpandedItems();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
break;
case kUnsubscribe:
@@ -524,34 +536,49 @@ TBarApp::MessageReceived(BMessage* message)
case kSuperExpando:
fSettings.superExpando = !fSettings.superExpando;
fBarWindow->Lock();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
// if mini mode we don't need to update the view
if (fBarView->MiniState())
break;
fBarWindow->Lock();
fBarView->SaveExpandedItems();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
break;
case kExpandNewTeams:
fSettings.expandNewTeams = !fSettings.expandNewTeams;
fBarWindow->Lock();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
// if mini mode we don't need to update the view
if (fBarView->MiniState())
break;
fBarWindow->Lock();
fBarView->SaveExpandedItems();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
break;
case kHideLabels:
fSettings.hideLabels = !fSettings.hideLabels;
fBarWindow->Lock();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
// if mini mode we don't need to update the view
if (fBarView->MiniState())
break;
fBarWindow->Lock();
fBarView->SaveExpandedItems();
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
break;
case kResizeTeamIcons:
@@ -575,11 +602,15 @@ TBarApp::MessageReceived(BMessage* message)
ResizeTeamIcons();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
// if mini mode we don't need to update the view
if (fBarView->MiniState())
break;
fBarWindow->Lock();
fBarView->SaveExpandedItems();
if (!fBarView->Vertical()) {
// Must also resize the Deskbar menu and replicant tray in
// horizontal mode
@@ -588,10 +619,6 @@ TBarApp::MessageReceived(BMessage* message)
}
fBarView->PlaceApplicationBar();
fBarWindow->Unlock();
if (fPreferencesWindow != NULL)
fPreferencesWindow->PostMessage(kUpdatePreferences);
break;
}