Ticket #7052: Deskbar WindowMenu Refactoring 1.diff

src/apps/deskbar/WindowMenu.cpp

@@ -81 +81 @@
     fExpandedIndex(0)
 {
     SetItemMargins(0.0f, 0.0f, 0.0f, 0.0f);
+    fBarView = static_cast<TBarApp*>(be_app)->BarView();
 }
 
 
@@ -94 +95 @@
     int32 miniCount = 0;
 
     bool dragging = false;
-    TBarView* barview =(static_cast<TBarApp*>(be_app))->BarView();
-    if (barview && barview->LockLooper()) {
+    if (fBarView && fBarView->LockLooper()) {
         //  'dragging' mode set in BarView::CacheDragData
         //      invoke in MouseEnter in ExpandoMenuBar
-        dragging = barview->Dragging();
+        dragging = fBarView->Dragging();
         if (dragging) {
             // We don't want to show the menu when dragging, but it's not
             // possible to remove a submenu once it exists, so we simply hide it
@@ -106 +106 @@
             // and then.
             Window()->Hide();
             //  if in expando (horizontal or vertical)
-            if (barview->Expando()) {
-                SetTrackingHook(barview->MenuTrackingHook,
-                    barview->GetTrackingHookData());
+            if (fBarView->Expando()) {
+                SetTrackingHook(fBarView->MenuTrackingHook,
+                    fBarView->GetTrackingHookData());
             }
-            barview->DragStart();
+            fBarView->DragStart();
         }
-        barview->UnlockLooper();
+        fBarView->UnlockLooper();
     }
 
     int32 parentMenuItems = 0;
@@ -227 +227 @@
 {
     // in expando mode the teammenu will not call DragStop,
     // thus, it needs to be called from here
-    TBarView* barview = (dynamic_cast<TBarApp*>(be_app))->BarView();
-    if (barview && barview->Expando() && barview->Dragging()
-        && barview->LockLooper()) {
+    if (fBarView && fBarView->Expando() && fBarView->Dragging()
+        && fBarView->LockLooper()) {
         // We changed the show level in AttachedToWindow().  Undo it.
         Window()->Show();
-        barview->DragStop();
-        barview->UnlockLooper();
+        fBarView->DragStop();
+        fBarView->UnlockLooper();
     }
 
     BMenu::DetachedFromWindow();

src/apps/deskbar/WindowMenu.h

@@ -55 +55 @@
         static bool     WindowShouldBeListed(uint32 behavior);
 
     private:
-        const BList     *fTeam;
+        const BList*    fTeam;
+        TBarView*       fBarView;
         BString         fApplicationSignature;
         bool            fExpanded;
         int             fExpandedIndex;