From db9feb346e966dddbe91019870b334d88c4ae4a2 Mon Sep 17 00:00:00 2001 From: Ryan Leavengood Date: Thu, 1 Oct 2009 20:22:30 +0000 Subject: [PATCH] - Reordered headers to match coding guidelines. - Added use of the new BuildScreenSaverDefaultSettingsView function (this is basically the same code.) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33402 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../screensaver/ScreenSaverWindow.cpp | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp index fe5b087679..1fdb962716 100644 --- a/src/preferences/screensaver/ScreenSaverWindow.cpp +++ b/src/preferences/screensaver/ScreenSaverWindow.cpp @@ -9,11 +9,10 @@ */ -#include "PreviewView.h" -#include "ScreenCornerSelector.h" -#include "ScreenSaverItem.h" #include "ScreenSaverWindow.h" +#include + #include #include #include @@ -32,7 +31,11 @@ #include #include -#include +#include + +#include "PreviewView.h" +#include "ScreenCornerSelector.h" +#include "ScreenSaverItem.h" const uint32 kPreviewMonitorGap = 16; @@ -529,18 +532,10 @@ ModulesView::_OpenSaver() if (fSettingsView->ChildAt(0) == NULL) { // There are no settings at all, we add the module name here to // let it look a bit better at least. - rect = BRect(15, 15, 20, 20); - BStringView* stringView = new BStringView(rect, "module", fSettings.ModuleName()[0] - ? fSettings.ModuleName() : "Blackness"); - stringView->SetFont(be_bold_font); - stringView->ResizeToPreferred(); - fSettingsView->AddChild(stringView); - - rect.OffsetBy(0, stringView->Bounds().Height() + 4); - stringView = new BStringView(rect, "info", saver || !fSettings.ModuleName()[0] - ? "No options available" : "Could not load screen saver"); - stringView->ResizeToPreferred(); - fSettingsView->AddChild(stringView); + BuildScreenSaverDefaultSettingsView(fSettingsView, + fSettings.ModuleName()[0] ? fSettings.ModuleName() : "Blackness", + saver || !fSettings.ModuleName()[0] + ? "No options available" : "Could not load screen saver"); } ScreenSaverWindow* window = dynamic_cast(Window());