Ticket #7051: Deskbar Persist Expanded State 3.diff

src/apps/deskbar/BarView.cpp

@@ -68 +68 @@
 
 const int32 kMenuTrackMargin = 20;
 
+BList TBarView::sExpandedItems;
+
+
 TBarView::TBarView(BRect frame, bool vertical, bool left, bool top,
         bool showInterval, uint32 state, float, bool showTime)
     : BView(frame, "BarView", B_FOLLOW_ALL_SIDES, B_WILL_DRAW),
@@ -92 +95 @@
     fDragRegion->AddChild(fReplicantTray);
     if (fTrayLocation != 0)
         AddChild(fDragRegion);
+
+    sExpandedItems.MakeEmpty();
 }
 
 
@@ -99 +104 @@
 {
     delete fDragMessage;
     delete fCachedTypesList;
+
+    // Clean up the expanded items list
+    while (!sExpandedItems.IsEmpty())
+        delete static_cast<BString*>(sExpandedItems.RemoveItem((int32)0));
+    sExpandedItems.MakeEmpty();
 }
 
 
@@ -453 +463 @@
     PlaceTray(vertSwap, leftSwap, screenFrame);
 
     // We need to keep track of what apps are expanded.
-    BList expandedItems;
-    BString* signature = NULL;
-    if (fVertical && Expando()
-        && static_cast<TBarApp*>(be_app)->Settings()->superExpando) {
-        // Get a list of the signatures of expanded apps. Can't use
-        // team_id because there can be more than one team per application
-        if (fVertical && Expando() && vertical && fExpando) {
-            for (int index = 0; index < fExpando->CountItems(); index++) {
-                TTeamMenuItem* item
-                    = dynamic_cast<TTeamMenuItem*>(fExpando->ItemAt(index));
-                if (item != NULL && item->IsExpanded()) {
-                    signature = new BString(item->Signature());
-                    expandedItems.AddItem((void*)signature);
-                }
-            }
-        }
-    }
+    SaveExpandedItems();
 
     PlaceApplicationBar(screenFrame);
     SizeWindow(screenFrame);
@@ -477 +471 @@
     Window()->UpdateIfNeeded();
 
     // Re-expand those apps.
-    if (expandedItems.CountItems() > 0) {
-        for (int sigIndex = expandedItems.CountItems(); sigIndex-- > 0;) {
-            signature = static_cast<BString*>(expandedItems.ItemAt(sigIndex));
-            if (signature == NULL)
-                continue;
-
-            // Start at the 'bottom' of the list working up.
-            // Prevents being thrown off by expanding items.
-            for (int teamIndex = fExpando->CountItems(); teamIndex-- > 0;) {
-                TTeamMenuItem* item
-                    = dynamic_cast<TTeamMenuItem*>(fExpando->ItemAt(teamIndex));
-                if (item != NULL && !signature->Compare(item->Signature())) {
-                    item->ToggleExpandState(false);
+    ExpandItems();
+    Invalidate();
+}
+
+
+void
+TBarView::SaveExpandedItems()
+{
+    if (!fExpando)
+        return;
+
+    // Get a list of the signatures of expanded apps. Can't use
+    // team_id because there can be more than one team per application
+    for (int32 teamIndex = fExpando->CountItems(); teamIndex-- > 0;) {
+        TTeamMenuItem* teamItem
+            = dynamic_cast<TTeamMenuItem*>(fExpando->ItemAt(teamIndex));
+        if (teamItem == NULL || teamItem->Signature() == NULL ||
+            *teamItem->Signature() == '\0')
+            continue;
+
+        if (teamItem->IsExpanded()) {
+            // Expanded, if signature is not in the list add it
+            bool shouldAdd = true;
+
+            for (int32 sigIndex = sExpandedItems.CountItems();
+                sigIndex-- > 0;) {
+                BString *signature = (BString *)sExpandedItems.ItemAt(sigIndex);
+                if (signature->ICompare(teamItem->Signature()) == 0) {
+                    // already in the list, don't add the signature
+                    shouldAdd = false;
                     break;
                 }
             }
-        }
 
-        // Clean up expanded signature list.
-        while (!expandedItems.IsEmpty()) {
-            delete static_cast<BString*>(expandedItems.RemoveItem((int32)0));
+            if (shouldAdd) {
+                // Add the signature to the list
+                BString* signature = new BString(teamItem->Signature());
+                sExpandedItems.AddItem((void*)signature);
+            }
         }
+    }
+}
+
+
+void
+TBarView::ExpandItems()
+{
+    if (!fExpando || !fVertical || !Expando()
+        || !static_cast<TBarApp*>(be_app)->Settings()->superExpando
+        || sExpandedItems.CountItems() <= 0)
+        return;
 
-        fExpando->SizeWindow();
+    // Start at the 'bottom' of the list working up.
+    // Prevents being thrown off by expanding items.
+    for (int32 teamIndex = fExpando->CountItems(); teamIndex-- > 0;) {
+        TTeamMenuItem* teamItem
+            = dynamic_cast<TTeamMenuItem*>(fExpando->ItemAt(teamIndex));
+        if (teamItem == NULL || teamItem->Signature() == NULL
+            || *teamItem->Signature() == '\0')
+            continue;
+
+        for (int32 sigIndex = sExpandedItems.CountItems(); sigIndex-- > 0;) {
+            BString* signature = (BString *)sExpandedItems.ItemAt(sigIndex);
+
+            if (signature->ICompare(teamItem->Signature()) == 0) {
+                teamItem->ToggleExpandState(false);
+                sExpandedItems.RemoveItem(sigIndex);
+                break;
+            }
+        }
     }
 
-    Invalidate();
+    // Clean up the expanded items list
+    while (!sExpandedItems.IsEmpty())
+        delete static_cast<BString*>(sExpandedItems.RemoveItem((int32)0));
+    sExpandedItems.MakeEmpty();
+
+    fExpando->SizeWindow();
 }
 
 

src/apps/deskbar/BarView.h

@@ -146 +146 @@
         void PlaceBeMenu();
         void PlaceTray(bool vertSwap, bool leftSwap, BRect screenFrame);
         void PlaceApplicationBar(BRect screenFrame);
+        void SaveExpandedItems();
+        void ExpandItems();
 
         TBarMenuBar* fBarMenuBar;
         TExpandoMenuBar* fExpando;
@@ -172 +174 @@
         uint32 fMaxRecentApps;
 
         TTeamMenuItem* fLastDragItem;
+        static BList sExpandedItems;
 };