* The screen corner selection view now follow the window bottom.

* Some more cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17751 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/preferences/screensaver/MouseAreaView.cpp

@@ -32,8 +32,8 @@ scale_arrow(int x, int y, BRect area, bool invertX, bool invertY)
 //	#pragma mark -
 
 
-MouseAreaView::MouseAreaView(BRect frame, const char *name) 
+MouseAreaView::MouseAreaView(BRect frame, const char *name, uint32 resizingMode)
-	: BView (frame, name, B_FOLLOW_NONE, B_WILL_DRAW),
+	: BView(frame, name, resizingMode, B_WILL_DRAW),
 	fCurrentCorner(NONE)
 {
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));

src/preferences/screensaver/MouseAreaView.h

@@ -16,7 +16,7 @@
 
 class MouseAreaView : public BView {
 	public:
-		MouseAreaView(BRect frame, const char *name);
+		MouseAreaView(BRect frame, const char *name, uint32 resizingMode);
 
 		virtual void Draw(BRect update); 
 		virtual void MouseUp(BPoint point);

src/preferences/screensaver/ScreenSaverWindow.cpp

@@ -584,13 +584,7 @@ ModulesView::_OpenSaver()
 
 ScreenSaverWindow::ScreenSaverWindow() 
 	: BWindow(BRect(50, 50, 496, 375), "Screen Saver",
-		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS /*| B_NOT_ZOOMABLE | B_NOT_RESIZABLE*/),
+		B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS /*| B_NOT_ZOOMABLE | B_NOT_RESIZABLE*/)
-	fFadeNowString(NULL),
-	fFadeNowString2(NULL),
-	fDontFadeString(NULL),
-	fDontFadeString2(NULL),
-	fFadeNow(NULL),
-	fFadeNever(NULL)
 {
 	fPrefs.LoadSettings();
 
@@ -712,24 +706,26 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
 
 	// Bottom
 
-	box->AddChild(fFadeNow = new MouseAreaView(BRect(20,205,80,260),"fadeNow"));
+	box->AddChild(fFadeNow = new MouseAreaView(BRect(20,205,80,260),"fadeNow",
-	box->AddChild(fFadeNever = new MouseAreaView(BRect(220,205,280,260),"fadeNever"));
+		B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
+	box->AddChild(fFadeNever = new MouseAreaView(BRect(220,205,280,260),"fadeNever",
+		B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
 
-	box->AddChild(fFadeNowString = new BStringView(BRect(90,215,193,230),"FadeNowString","Fade now when"));
+	stringView = new BStringView(BRect(90,215,193,230),
-	fFadeNowString->SetText("Fade now when");
+		"FadeNowString", "Fade now when", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
-	fFadeNowString->SetAlignment(B_ALIGN_LEFT);
+	box->AddChild(stringView);
 
-	box->AddChild(fFadeNowString2 = new BStringView(BRect(90,233,193,248),"FadeNowString2","mouse is here"));
+	stringView = new BStringView(BRect(90,233,193,248),
-	fFadeNowString2->SetText("mouse is here");
+		"FadeNowString2","mouse is here", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
-	fFadeNowString2->SetAlignment(B_ALIGN_LEFT);
+	box->AddChild(stringView);
 
-	box->AddChild(fDontFadeString = new BStringView(BRect(290,215,387,230),"DontFadeString","Don't fade when"));
+	stringView = new BStringView(BRect(290,215,387,230),
-	fDontFadeString->SetText("Don't fade when");
+		"DontFadeString","Don't fade when", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
-	fDontFadeString->SetAlignment(B_ALIGN_LEFT);
+	box->AddChild(stringView);
 
-	box->AddChild(fDontFadeString2 = new BStringView(BRect(290,233,387,248),"DontFadeString2","mouse is here"));
+	stringView = new BStringView(BRect(290,233,387,248),
-	fDontFadeString2->SetText("mouse is here");
+		"DontFadeString2","mouse is here", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
-	fDontFadeString2->SetAlignment(B_ALIGN_LEFT);
+	box->AddChild(stringView);
 }
 
 

src/preferences/screensaver/ScreenSaverWindow.h

@@ -19,7 +19,6 @@
 #include <FilePanel.h>
 #include <Slider.h>
 #include <ListView.h>
-#include <StringView.h>
 
 class BButton;
 
@@ -64,11 +63,6 @@ class ScreenSaverWindow : public BWindow {
 		BButton*		fPasswordButton;
 		PasswordWindow*	fPasswordWindow;
 
-		BStringView *fFadeNowString;
-		BStringView *fFadeNowString2;
-		BStringView *fDontFadeString;
-		BStringView *fDontFadeString2;
-
 		MouseAreaView*	fFadeNow;
 		MouseAreaView*	fFadeNever;
 };