Ticket #7132: Deskbar Resize Team Icons 4.diff

src/apps/deskbar/BarApp.cpp

@@ -72 +72 @@
 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;
 
 
@@ -119 +119 @@
     fBarWindow = new TBarWindow();
     fBarWindow->Show();
 
+    fBarView = static_cast<TBarApp*>(be_app)->BarView();
+
     // this messenger now targets the barview instead of the
     // statusview so that all additions to the tray
     // follow the same path
@@ -208 +210 @@
             fSettings.superExpando);
         storedSettings.AddBool("expandNewTeams",
             fSettings.expandNewTeams);
+        storedSettings.AddInt32("iconSize",
+            fSettings.iconSize);
         storedSettings.AddBool("autoRaise",
             fSettings.autoRaise);
         storedSettings.AddBool("recentAppsEnabled",
@@ -244 +248 @@
     settings.sortRunningApps = false;
     settings.superExpando = false;
     settings.expandNewTeams = false;
+    settings.iconSize = 1;
     settings.autoRaise = false;
     settings.recentAppsEnabled = true;
     settings.recentDocsEnabled = true;
@@ -295 +300 @@
                 &settings.superExpando);
             storedSettings.FindBool("expandNewTeams",
                 &settings.expandNewTeams);
+            storedSettings.FindInt32("iconSize",
+                (int32*)&settings.iconSize);
             storedSettings.FindBool("autoRaise",
                 &settings.autoRaise);
             storedSettings.FindBool("recentAppsEnabled",
@@ -478 +485 @@
             break;
         }
 
+        case kResizeTeamIcons:
+        {
+            int32 iconSize;
+
+            if (message->FindInt32("be:value", &iconSize) == B_OK)
+                fSettings.iconSize = iconSize;
+
+            if (fSettings.iconSize < 1)
+                fSettings.iconSize = 1;
+            else if (fSettings.iconSize > 4)
+                fSettings.iconSize = 4;
+
+            ResizeTeamIcons();
+
+            fBarWindow->Lock();
+            fBarView->UpdatePlacement();
+            fBarWindow->Unlock();
+            break;
+        }
+
         case 'TASK':
             fSwitcherMessenger.SendMessage(message);
             break;
@@ -628 +655 @@
         return;
     }
 
-    BFile file(ref, B_READ_ONLY);
-    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)
-        appMime.GetTrackerIcon(barInfo->icon, B_MINI_ICON);
 
     sBarTeamInfoList.AddItem(barInfo);
+    BMessage message(kResizeTeamIcons);
+    be_app->PostMessage(&message);
 
     int32 subsCount = sSubscribers.CountItems();
     if (subsCount > 0) {
@@ -698 +722 @@
 
 
 void
+TBarApp::ResizeTeamIcons()
+{
+    BRect iconRect;
+
+    if (fBarView->Vertical())
+        iconRect = BRect(0, 0, ((fSettings.iconSize * 16) - 1),
+            ((fSettings.iconSize * 16) - 1));
+    else
+        iconRect = kIconRect;
+
+    for (int32 i = 0; i < sBarTeamInfoList.CountItems(); i++) {
+        BarTeamInfo* barInfo = (BarTeamInfo*)sBarTeamInfoList.ItemAt(i);
+        if ((barInfo->flags & B_BACKGROUND_APP) == 0
+            && strcasecmp(barInfo->sig, kDeskbarSignature) != 0) {
+            barInfo->icon = new BBitmap(iconRect, kIconFormat);
+            FetchAppIcon(barInfo->sig, barInfo->icon);
+        }
+    }
+}
+
+
+void
 TBarApp::ShowPreferencesWindow()
 {
     if (fPreferencesWindow)
@@ -709 +755 @@
 }
 
 
+void
+TBarApp::FetchAppIcon(const char* signature, BBitmap* icon)
+{
+    app_info appInfo;
+
+    if (be_roster->GetAppInfo(signature, &appInfo) == B_OK) {
+        BFile file(&appInfo.ref, B_READ_ONLY);
+        BAppFileInfo appMime(&file);
+        if (fBarView->Vertical() && icon->Bounds().IntegerHeight() > 15) {
+            if (appMime.GetIcon(icon, B_LARGE_ICON) != B_OK)
+                appMime.GetTrackerIcon(icon, B_LARGE_ICON);
+        } else {
+            if (appMime.GetIcon(icon, B_MINI_ICON) != B_OK)
+                appMime.GetTrackerIcon(icon, B_MINI_ICON);
+        }
+    }
+}
+
+
 //  #pragma mark -
 
 

src/apps/deskbar/BarApp.h

@@ -80 +80 @@
 const uint32 kSortRunningApps = 'SAps';
 const uint32 kSuperExpando = 'SprE';
 const uint32 kExpandNewTeams = 'ExTm';
+const uint32 kResizeTeamIcons = 'RTIs';
 const uint32 kAutoRaise = 'AtRs';
 const uint32 kRestartTracker = 'Trak';
 
@@ -109 +110 @@
     bool sortRunningApps;
     bool superExpando;
     bool expandNewTeams;
+    int32 iconSize;
     bool autoRaise;
     bool recentAppsEnabled;
     bool recentDocsEnabled;
@@ -139 +141 @@
 
         static void Subscribe(const BMessenger &subscriber, BList*);
         static void Unsubscribe(const BMessenger &subscriber);
+        void ResizeTeamIcons();
 
     private:
         void AddTeam(team_id team, uint32 flags, const char *sig, entry_ref *);
@@ -148 +151 @@
         void SaveSettings();
 
         void ShowPreferencesWindow();
+        void FetchAppIcon(const char* signature, BBitmap* icon);
 
         TBarWindow* fBarWindow;
+        TBarView* fBarView;
         BMessenger fSwitcherMessenger;
         BMessenger fStatusViewMessenger;
         BFile* fSettingsFile;

src/apps/deskbar/BarView.cpp

@@ -439 +439 @@
     fLeft = left;
     fTop = top;
 
+    // If switching vertical orientation resize the icons
+    if (vertSwap)
+        static_cast<TBarApp*>(be_app)->ResizeTeamIcons();
+
     BRect screenFrame = (BScreen(Window())).Frame();
 
     PlaceBeMenu();

src/apps/deskbar/PreferencesWindow.cpp

@@ -17 +17 @@
 #include <OpenWithTracker.h>
 #include <RadioButton.h>
 #include <SeparatorView.h>
+#include <Slider.h>
 
 #include <ctype.h>
 
@@ -57 +58 @@
         new BMessage(kSuperExpando));
     fAppsExpandNew = new BCheckBox(B_TRANSLATE("Expand new applications"),
         new BMessage(kExpandNewTeams));
+    fAppsIconSizeSlider = new BSlider("icon_size", B_TRANSLATE("Icon size"), 
+        new BMessage(kResizeTeamIcons), 1, 4, B_HORIZONTAL);
+    fAppsIconSizeSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
+    fAppsIconSizeSlider->SetHashMarkCount(4);
+    fAppsIconSizeSlider->SetLimitLabels(B_TRANSLATE("Small"), 
+        B_TRANSLATE("Large"));
 
     fClockSeconds = new BCheckBox(B_TRANSLATE("Show seconds"),
         new BMessage(kShowSeconds));
@@ -89 +96 @@
     fAppsSortTrackerFirst->SetValue(appSettings->trackerAlwaysFirst);
     fAppsShowExpanders->SetValue(appSettings->superExpando);
     fAppsExpandNew->SetValue(appSettings->expandNewTeams);
+    fAppsIconSizeSlider->SetValue(appSettings->iconSize);
 
     int32 docCount = appSettings->recentDocsCount;
     int32 appCount = appSettings->recentAppsCount;
@@ -131 +139 @@
     fAppsSort->SetTarget(be_app);
     fAppsSortTrackerFirst->SetTarget(be_app);
     fAppsExpandNew->SetTarget(be_app);
+    fAppsIconSizeSlider->SetTarget(be_app);
 
     fClockSeconds->SetTarget(replicantTray);
 
@@ -179 +188 @@
                 .SetInsets(20, 0, 0, 0)
                 .Add(fAppsExpandNew)
                 .End()
+            .Add(fAppsIconSizeSlider)
             .AddGlue()
             .SetInsets(10, 10, 10, 10)
             .End()

src/apps/deskbar/PreferencesWindow.h

@@ -10 +10 @@
 #include <Button.h>
 #include <CheckBox.h>
 #include <RadioButton.h>
+#include <Slider.h>
 #include <StringView.h>
 #include <TextControl.h>
 #include <Window.h>
@@ -51 +52 @@
             BCheckBox*      fAppsSortTrackerFirst;
             BCheckBox*      fAppsShowExpanders;
             BCheckBox*      fAppsExpandNew;
+            BSlider*        fAppsIconSizeSlider;
 
             BCheckBox*      fClockSeconds;