From 9fd9f94dcc4aa29a3f2ed10cbed86fbe16aacd7b Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 23 Nov 2012 22:27:36 -0500 Subject: [PATCH] Make prefs window height depend on content --- src/apps/deskbar/PreferencesWindow.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp index 6f2615ba9b1..ae42330ea4d 100644 --- a/src/apps/deskbar/PreferencesWindow.cpp +++ b/src/apps/deskbar/PreferencesWindow.cpp @@ -237,7 +237,6 @@ PreferencesWindow::PreferencesWindow(BRect frame) .SetInsets(0, B_USE_DEFAULT_SPACING, 0, 0) .Add(fAppsIconSizeSlider) .End() - .AddGlue() .SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING) .End() @@ -248,7 +247,6 @@ PreferencesWindow::PreferencesWindow(BRect frame) .Add(fWindowAlwaysOnTop) .Add(fWindowAutoRaise) .Add(fWindowAutoHide) - .AddGlue() .SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING) .End() @@ -398,7 +396,7 @@ PreferencesWindow::_HandleChangedSettingsView() dynamic_cast (fSettingsTypeListView->ItemAt(currentSelection)); - if (selectedItem) { + if (selectedItem != NULL) { fSettingsContainerBox->SetLabel(selectedItem->Text()); BView* view = selectedItem->View();