Ticket #7052: Deskbar Disable Expand Options 1.diff

src/apps/deskbar/BarApp.cpp

@@ -334 +334 @@
             ShowPreferencesWindow();
             break;
 
+        case kStateChanged:
+            fPreferencesWindow->PostMessage(kStateChanged);
+            break;
+
         case kShowBeMenu:
             if (fBarWindow->Lock()) {
                 fBarWindow->ShowBeMenu();

src/apps/deskbar/BarView.cpp

@@ -130 +130 @@
 TBarView::Draw(BRect)
 {
     BRect bounds(Bounds());
-    
+
     rgb_color hilite = tint_color(ViewColor(), B_DARKEN_1_TINT);
     rgb_color light = tint_color(ViewColor(), B_LIGHTEN_2_TINT);
-    
+
     SetHighColor(hilite);
     if (AcrossTop()) 
         StrokeLine(bounds.LeftBottom(), bounds.RightBottom());
@@ -433 +433 @@
 {
     bool vertSwap = (fVertical != vertical);
     bool leftSwap = (fLeft != left);
+    bool stateChanged = (fState != state);
 
     fState = state;
     fVertical = vertical;
     fLeft = left;
     fTop = top;
 
+    // Send a message to the preferences window to let it know to enable
+    // or disabled preference items
+    if (stateChanged || vertSwap) {
+        BMessage message(kStateChanged);
+        be_app->PostMessage(&message);
+    }
+
     BRect screenFrame = (BScreen(Window())).Frame();
 
     PlaceBeMenu();

src/apps/deskbar/PreferencesWindow.cpp

@@ -242 +242 @@
             be_app->PostMessage(message);
             break;
 
+        case kStateChanged:
+            _EnableDisableDependentItems();
+            break;
+
         default:
             BWindow::MessageReceived(message);
             break;
@@ -275 +279 @@
 void
 PreferencesWindow::_EnableDisableDependentItems()
 {
-    if (fAppsShowExpanders->Value())
-        fAppsExpandNew->SetEnabled(true);
-    else
+    TBarApp* barApp = static_cast<TBarApp*>(be_app);
+    if (barApp->BarView()->Vertical()
+        && barApp->BarView()->Expando()) {
+        fAppsShowExpanders->SetEnabled(true);
+        fAppsExpandNew->SetEnabled(fAppsShowExpanders->Value());
+    } else {
+        fAppsShowExpanders->SetEnabled(false);
         fAppsExpandNew->SetEnabled(false);
+    }
 
     if (fMenuRecentDocuments->Value())
         fMenuRecentDocumentCount->SetEnabled(true);

src/apps/deskbar/PreferencesWindow.h

@@ -19 +19 @@
 const uint32 kConfigClose = 'canc';
 const uint32 kUpdateRecentCounts = 'upct';
 const uint32 kEditMenuInTracker = 'mtrk';
+const uint32 kStateChanged = 'stch';
 
 
 class PreferencesWindow : public BWindow