From 4da6b5c3284004fd85949c90ebf0124ac9c87b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 7 Jun 2006 11:51:37 +0000 Subject: [PATCH] * 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 | 4 +- src/preferences/screensaver/MouseAreaView.h | 2 +- .../screensaver/ScreenSaverWindow.cpp | 38 +++++++++---------- .../screensaver/ScreenSaverWindow.h | 6 --- 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/preferences/screensaver/MouseAreaView.cpp b/src/preferences/screensaver/MouseAreaView.cpp index 680cc4f51f..9071e93ff3 100644 --- a/src/preferences/screensaver/MouseAreaView.cpp +++ b/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) - : BView (frame, name, B_FOLLOW_NONE, B_WILL_DRAW), +MouseAreaView::MouseAreaView(BRect frame, const char *name, uint32 resizingMode) + : BView(frame, name, resizingMode, B_WILL_DRAW), fCurrentCorner(NONE) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); diff --git a/src/preferences/screensaver/MouseAreaView.h b/src/preferences/screensaver/MouseAreaView.h index e2fb2b5e8f..5e6b4ba1eb 100644 --- a/src/preferences/screensaver/MouseAreaView.h +++ b/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); diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp index 72fd829175..cefdfb6f8d 100644 --- a/src/preferences/screensaver/ScreenSaverWindow.cpp +++ b/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*/), - fFadeNowString(NULL), - fFadeNowString2(NULL), - fDontFadeString(NULL), - fDontFadeString2(NULL), - fFadeNow(NULL), - fFadeNever(NULL) + B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS /*| B_NOT_ZOOMABLE | B_NOT_RESIZABLE*/) { fPrefs.LoadSettings(); @@ -712,24 +706,26 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect) // Bottom - box->AddChild(fFadeNow = new MouseAreaView(BRect(20,205,80,260),"fadeNow")); - box->AddChild(fFadeNever = new MouseAreaView(BRect(220,205,280,260),"fadeNever")); + box->AddChild(fFadeNow = new MouseAreaView(BRect(20,205,80,260),"fadeNow", + 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")); - fFadeNowString->SetText("Fade now when"); - fFadeNowString->SetAlignment(B_ALIGN_LEFT); + stringView = new BStringView(BRect(90,215,193,230), + "FadeNowString", "Fade now when", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + box->AddChild(stringView); - box->AddChild(fFadeNowString2 = new BStringView(BRect(90,233,193,248),"FadeNowString2","mouse is here")); - fFadeNowString2->SetText("mouse is here"); - fFadeNowString2->SetAlignment(B_ALIGN_LEFT); + stringView = new BStringView(BRect(90,233,193,248), + "FadeNowString2","mouse is here", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + box->AddChild(stringView); - box->AddChild(fDontFadeString = new BStringView(BRect(290,215,387,230),"DontFadeString","Don't fade when")); - fDontFadeString->SetText("Don't fade when"); - fDontFadeString->SetAlignment(B_ALIGN_LEFT); + stringView = new BStringView(BRect(290,215,387,230), + "DontFadeString","Don't fade when", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + box->AddChild(stringView); - box->AddChild(fDontFadeString2 = new BStringView(BRect(290,233,387,248),"DontFadeString2","mouse is here")); - fDontFadeString2->SetText("mouse is here"); - fDontFadeString2->SetAlignment(B_ALIGN_LEFT); + stringView = new BStringView(BRect(290,233,387,248), + "DontFadeString2","mouse is here", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); + box->AddChild(stringView); } diff --git a/src/preferences/screensaver/ScreenSaverWindow.h b/src/preferences/screensaver/ScreenSaverWindow.h index c4a6a7ed53..3ab2cfc71c 100644 --- a/src/preferences/screensaver/ScreenSaverWindow.h +++ b/src/preferences/screensaver/ScreenSaverWindow.h @@ -19,7 +19,6 @@ #include #include #include -#include 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; };