Ticket #4830: Deskbar Autoexpand 2.diff

src/apps/deskbar/BarApp.cpp

@@ -206 +206 @@
             fSettings.sortRunningApps);
         storedSettings.AddBool("superExpando",
             fSettings.superExpando);
-        storedSettings.AddBool("expandNewTeams",
-            fSettings.expandNewTeams);
+        storedSettings.AddBool("autoExpandTeams",
+            fSettings.autoExpandTeams);
         storedSettings.AddBool("autoRaise",
             fSettings.autoRaise);
         storedSettings.AddBool("recentAppsEnabled",
@@ -243 +243 @@
     settings.trackerAlwaysFirst = false;
     settings.sortRunningApps = false;
     settings.superExpando = false;
-    settings.expandNewTeams = false;
+    settings.autoExpandTeams = false;
     settings.autoRaise = false;
     settings.recentAppsEnabled = true;
     settings.recentDocsEnabled = true;
@@ -293 +293 @@
                 &settings.sortRunningApps);
             storedSettings.FindBool("superExpando",
                 &settings.superExpando);
-            storedSettings.FindBool("expandNewTeams",
-                &settings.expandNewTeams);
+            storedSettings.FindBool("autoExpandTeams",
+                &settings.autoExpandTeams);
             storedSettings.FindBool("autoRaise",
                 &settings.autoRaise);
             storedSettings.FindBool("recentAppsEnabled",
@@ -384 +384 @@
             message->FindRef("be:ref", &ref);
 
             AddTeam(team, flags, sig, &ref);
+
+            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
+            fBarWindow->Lock();
+            barView->UpdatePlacement();
+            fBarWindow->Unlock();
+
             break;
         }
 
@@ -441 +447 @@
         {
             fSettings.sortRunningApps = !fSettings.sortRunningApps;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
-            fBarWindow->Lock();
+            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView(); fBarWindow->Lock();
             barView->UpdatePlacement();
             fBarWindow->Unlock();
             break;
@@ -467 +472 @@
             break;
         }
 
-        case kExpandNewTeams:
+        case kAutoExpandTeams:
         {
-            fSettings.expandNewTeams = !fSettings.expandNewTeams;
+            fSettings.autoExpandTeams = !fSettings.autoExpandTeams;
 
             TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            barView->ToggleExpandedItems();
             fBarWindow->Unlock();
             break;
         }

src/apps/deskbar/BarApp.h

@@ -79 +79 @@
 const uint32 kTrackerFirst = 'TkFt';
 const uint32 kSortRunningApps = 'SAps';
 const uint32 kSuperExpando = 'SprE';
-const uint32 kExpandNewTeams = 'ExTm';
+const uint32 kAutoExpandTeams = 'ExTm';
 const uint32 kAutoRaise = 'AtRs';
 const uint32 kRestartTracker = 'Trak';
 
@@ -108 +108 @@
     bool trackerAlwaysFirst;
     bool sortRunningApps;
     bool superExpando;
-    bool expandNewTeams;
+    bool autoExpandTeams;
     bool autoRaise;
     bool recentAppsEnabled;
     bool recentDocsEnabled;

src/apps/deskbar/BarView.cpp

@@ -469 +469 @@
     Window()->UpdateIfNeeded();
 
     // Re-expand those apps.
-    if (expandedItems.CountItems() > 0) {
+    if (static_cast<TBarApp*>(be_app)->Settings()->superExpando
+        && static_cast<TBarApp*>(be_app)->Settings()->autoExpandTeams)
+        ToggleExpandedItems();
+    else if (expandedItems.CountItems() > 0) {
         for (int sigIndex = expandedItems.CountItems(); sigIndex-- > 0;) {
             signature = static_cast<BString*>(expandedItems.ItemAt(sigIndex));
             if (signature == NULL)
@@ -499 +502 @@
 }
 
 
+void
+TBarView::ToggleExpandedItems()
+{
+    if (fExpando && fVertical && Expando()
+        && static_cast<TBarApp*>(be_app)->Settings()->superExpando) {
+        for (int32 teamIndex = fExpando->CountItems(); teamIndex-- > 0;) {
+            TTeamMenuItem* teamItem
+                = dynamic_cast<TTeamMenuItem*>(fExpando->ItemAt(teamIndex));
+            if (teamItem != NULL
+                && static_cast<TBarApp*>(be_app)->Settings()->autoExpandTeams !=
+                    teamItem->IsExpanded())
+                teamItem->ToggleExpandState(false);
+        }
+
+        fExpando->SizeWindow();
+    }
+}
+
+
 //  window placement functions
 
 bool

src/apps/deskbar/BarView.h

@@ -135 +135 @@
         TExpandoMenuBar* ExpandoMenuBar() const;
         TBarMenuBar* BarMenuBar() const;
         TDragRegion* DragRegion() const { return fDragRegion; }
+        void ToggleExpandedItems();
 
     private:
         friend class TBeMenu;

src/apps/deskbar/ExpandoMenuBar.cpp

@@ -80 +80 @@
     fDrawLabel(drawLabel),
     fIsScrolling(false),
     fShowTeamExpander(static_cast<TBarApp*>(be_app)->Settings()->superExpando),
-    fExpandNewTeams(static_cast<TBarApp*>(be_app)->Settings()->expandNewTeams),
+    fAutoExpandTeams(static_cast<TBarApp*>(be_app)->Settings()->autoExpandTeams),
     fBeMenuWidth(kDefaultBeMenuWidth),
     fBarView(bar),
     fFirstApp(0),
@@ -535 +535 @@
         AddItem(item);
 
     if (fVertical) {
-        if (item && fShowTeamExpander && fExpandNewTeams)
+        if (item && fShowTeamExpander && fAutoExpandTeams)
             item->ToggleExpandState(false);
 
         fBarView->SizeWindow(BScreen(Window()).Frame());

src/apps/deskbar/ExpandoMenuBar.h

@@ -97 +97 @@
         bool fDrawLabel : 1;
         bool fIsScrolling : 1;
         bool fShowTeamExpander : 1;
-        bool fExpandNewTeams : 1;
+        bool fAutoExpandTeams : 1;
 
         float fBeMenuWidth;
 

src/apps/deskbar/PreferencesWindow.cpp

@@ -55 +55 @@
     fAppsShowExpanders = new BCheckBox(
         B_TRANSLATE("Show application expander"),
         new BMessage(kSuperExpando));
-    fAppsExpandNew = new BCheckBox(B_TRANSLATE("Expand new applications"),
-        new BMessage(kExpandNewTeams));
+    fAppsAutoExpand = new BCheckBox(B_TRANSLATE("Auto-expand applications"),
+        new BMessage(kAutoExpandTeams));
 
     fClockSeconds = new BCheckBox(B_TRANSLATE("Show seconds"),
         new BMessage(kShowSeconds));
@@ -88 +88 @@
     fAppsSort->SetValue(appSettings->sortRunningApps);
     fAppsSortTrackerFirst->SetValue(appSettings->trackerAlwaysFirst);
     fAppsShowExpanders->SetValue(appSettings->superExpando);
-    fAppsExpandNew->SetValue(appSettings->expandNewTeams);
+    fAppsAutoExpand->SetValue(appSettings->autoExpandTeams);
 
     int32 docCount = appSettings->recentDocsCount;
     int32 appCount = appSettings->recentAppsCount;
@@ -130 +130 @@
     // Targets
     fAppsSort->SetTarget(be_app);
     fAppsSortTrackerFirst->SetTarget(be_app);
-    fAppsExpandNew->SetTarget(be_app);
+    fAppsAutoExpand->SetTarget(be_app);
 
     fClockSeconds->SetTarget(replicantTray);
 
@@ -177 +177 @@
             .Add(fAppsShowExpanders)
             .AddGroup(B_HORIZONTAL, 0)
                 .SetInsets(20, 0, 0, 0)
-                .Add(fAppsExpandNew)
+                .Add(fAppsAutoExpand)
                 .End()
             .AddGlue()
             .SetInsets(10, 10, 10, 10)
@@ -276 +276 @@
 PreferencesWindow::_EnableDisableDependentItems()
 {
     if (fAppsShowExpanders->Value())
-        fAppsExpandNew->SetEnabled(true);
+        fAppsAutoExpand->SetEnabled(true);
     else
-        fAppsExpandNew->SetEnabled(false);
+        fAppsAutoExpand->SetEnabled(false);
 
     if (fMenuRecentDocuments->Value())
         fMenuRecentDocumentCount->SetEnabled(true);

src/apps/deskbar/PreferencesWindow.h

@@ -50 +50 @@
             BCheckBox*      fAppsSort;
             BCheckBox*      fAppsSortTrackerFirst;
             BCheckBox*      fAppsShowExpanders;
-            BCheckBox*      fAppsExpandNew;
+            BCheckBox*      fAppsAutoExpand;
 
             BCheckBox*      fClockSeconds;
 

src/apps/deskbar/TeamMenuItem.cpp

@@ -497 +497 @@
         TWindowMenu* sub = (static_cast<TWindowMenu*>(Submenu()));
         if (sub) {
             // force the menu to update it's contents.
-            bool locked = sub->LockLooper();
+            if (sub->LockLooper()) {
                 // if locking the looper failed, the menu is just not visible
-            sub->AttachedToWindow();
-            if (locked)
+                sub->AttachedToWindow();
                 sub->UnlockLooper();
+            }
 
             if (sub->CountItems() > 1){
                 TExpandoMenuBar* parent = static_cast<TExpandoMenuBar*>(Menu());