Ticket #7052: Deskbar Style Changes and Refactoring 2.diff

src/apps/deskbar/BarApp.cpp

@@ -60 +60 @@
 #include "PublicCommands.h"
 #include "ResourceSet.h"
 #include "Switcher.h"
-#include "TeamMenu.h"
-#include "WindowMenuItem.h"
 
 
 BLocker TBarApp::sSubscriberLock;
@@ -72 +70 @@
 const uint32 kShowBeMenu = 'BeMn';
 const uint32 kShowTeamMenu = 'TmMn';
 
-const BRect kIconSize(0.0f, 0.0f, 15.0f, 15.0f);
 
+const BRect kIconRect(0.0f, 0.0f, 15.0f, 15.0f);
 static const color_space kIconFormat = B_RGBA32;
 
 
@@ -313 +311 @@
 void
 TBarApp::MessageReceived(BMessage* message)
 {
-    int32 count;
-    bool enabled;
     switch (message->what) {
         case 'gloc':
         case 'sloc':
@@ -353 +349 @@
             break;
 
         case kUpdateRecentCounts:
+            int32 count;
+            bool enabled;
+
             if (message->FindInt32("applications", &count) == B_OK)
                 fSettings.recentAppsCount = count;
             if (message->FindBool("applicationsEnabled", &enabled) == B_OK)
@@ -423 +422 @@
         {
             fSettings.autoRaise = !fSettings.autoRaise;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdateAutoRaise();
+            BarView()->UpdateAutoRaise();
             fBarWindow->Unlock();
             break;
         }
@@ -434 +432 @@
         {
             fSettings.trackerAlwaysFirst = !fSettings.trackerAlwaysFirst;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -445 +442 @@
         {
             fSettings.sortRunningApps = !fSettings.sortRunningApps;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -464 +460 @@
         {
             fSettings.superExpando = !fSettings.superExpando;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -475 +470 @@
         {
             fSettings.expandNewTeams = !fSettings.expandNewTeams;
 
-            TBarView* barView = static_cast<TBarApp*>(be_app)->BarView();
             fBarWindow->Lock();
-            barView->UpdatePlacement();
+            BarView()->UpdatePlacement();
             fBarWindow->Unlock();
             break;
         }
@@ -636 +630 @@
     BAppFileInfo appMime(&file);
 
     BarTeamInfo* barInfo = new BarTeamInfo(new BList(), flags, strdup(sig),
-        new BBitmap(kIconSize, kIconFormat), strdup(ref->name));
+        new BBitmap(kIconRect, kIconFormat), strdup(ref->name));
 
     barInfo->teams->AddItem((void*)team);
     if (appMime.GetIcon(barInfo->icon, B_MINI_ICON) != B_OK)

src/apps/deskbar/BarMenuTitle.h

@@ -46 +46 @@
 
 class TBarMenuTitle : public BMenuItem {
 public:
-    TBarMenuTitle(float width,float height, const BBitmap* icon,
+    TBarMenuTitle(float width, float height, const BBitmap* icon,
         BMenu* menu, bool inexpando = false);
     virtual ~TBarMenuTitle();
 

src/apps/deskbar/BarView.cpp

@@ -424 +424 @@
 void
 TBarView::UpdatePlacement()
 {
-    ChangeState(fState, fVertical, fLeft, fTop);    
+    ChangeState(fState, fVertical, fLeft, fTop);
 }
 
 
@@ -634 +634 @@
             if (item == fLastDragItem)
                 return B_OK;
 
-            fLastDragItem = item;       
-        }                   
+            fLastDragItem = item;
+        }
     }
 
     return B_OK;

src/apps/deskbar/BarWindow.cpp

@@ -312 +312 @@
     if (menuBar == NULL)
         return;
 
-    BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
+    BMenuBar_StartMenuBar_Hack(menuBar, 0, true, true, NULL);
 }
 
 
@@ -326 +326 @@
     if (KeyMenuBar() == NULL)
         return;
 
-    BMenuBar_StartMenuBar_Hack(KeyMenuBar(),index,true,true,NULL);
+    BMenuBar_StartMenuBar_Hack(KeyMenuBar(), index, true, true, NULL);
 }
 
 

src/apps/deskbar/ExpandoMenuBar.cpp

@@ -713 +713 @@
 TExpandoMenuBar::CheckForSizeOverrun()
 {
     BRect screenFrame = (BScreen(Window())).Frame();
-    if (fVertical)
-        fIsScrolling = Window()->Frame().bottom > screenFrame.bottom;
-    else
-        fIsScrolling = false;
+
+    fIsScrolling = fVertical ? Window()->Frame().bottom > screenFrame.bottom
+                             : false;
 }
 
 
@@ -744 +743 @@
             // Set all WindowMenuItems to require an update.
             TWindowMenuItem* item = NULL;
             for (int32 i = 0; i < totalItems; i++) {
-                if (!teamMenu->SubmenuAt(i)){
+                if (!teamMenu->SubmenuAt(i)) {
                     item = static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
                     item->SetRequireUpdate();
                 }
@@ -814 +813 @@
 
             // Remove any remaining items which require an update.
             for (int32 i = 0; i < totalItems; i++) {
-                if (!teamMenu->SubmenuAt(i)){
+                if (!teamMenu->SubmenuAt(i)) {
                     item = static_cast<TWindowMenuItem*>(teamMenu->ItemAt(i));
                     if (item && item->RequiresUpdate()) {
                         item = static_cast<TWindowMenuItem*>

src/apps/deskbar/PreferencesWindow.cpp

@@ -83 +83 @@
 
     // Values
     TBarApp* barApp = static_cast<TBarApp*>(be_app);
-    desk_settings* appSettings = barApp->Settings();;
+    desk_settings* appSettings = barApp->Settings();
 
     fAppsSort->SetValue(appSettings->sortRunningApps);
     fAppsSortTrackerFirst->SetValue(appSettings->trackerAlwaysFirst);

src/apps/deskbar/Switcher.cpp

@@ -1893 +1893 @@
 void
 TIconView::AnimateIcon(BBitmap* startIcon, BBitmap* endIcon)
 {
-    BRect centerRect(kCenterSlot*kSlotSize, 0,
+    BRect centerRect(kCenterSlot * kSlotSize, 0,
         (kCenterSlot + 1) * kSlotSize - 1, kSlotSize - 1);
     BRect startIconBounds = startIcon->Bounds();
     BRect bounds = Bounds();

src/apps/deskbar/TeamMenuItem.cpp

@@ -71 +71 @@
 }
 
 
-TTeamMenuItem::TTeamMenuItem(float width,float height,bool vertical)
+TTeamMenuItem::TTeamMenuItem(float width, float height, bool vertical)
     :   BMenuItem("", NULL)
 {
     InitData(NULL, NULL, strdup(""), strdup(""), width, height, false, vertical);
@@ -491 +491 @@
 TTeamMenuItem::ToggleExpandState(bool resizeWindow)
 {
     fExpanded = !fExpanded;
-    
+
     if (fExpanded) {
         // Populate Menu() with the stuff from SubMenu().
         TWindowMenu* sub = (static_cast<TWindowMenu*>(Submenu()));
@@ -503 +503 @@
             if (locked)
                 sub->UnlockLooper();
 
-            if (sub->CountItems() > 1){
+            if (sub->CountItems() > 1) {
                 TExpandoMenuBar* parent = static_cast<TExpandoMenuBar*>(Menu());
                 int myindex = parent->IndexOf(this) + 1;