Renamed MouseAreaView to ScreenCornerSelector.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17752 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-06-07 11:57:25 +00:00
parent 4da6b5c328
commit 5d74f3c143
5 changed files with 19 additions and 19 deletions

View File

@ -13,7 +13,7 @@ Preference ScreenSaver :
ScreenSaverWindow.cpp
PasswordWindow.cpp
PreviewView.cpp
MouseAreaView.cpp
ScreenCornerSelector.cpp
ScreenSaver.cpp
# needed for some old/broken screen saver add-ons that do not

View File

@ -6,7 +6,7 @@
* Michael Phipps
*/
#include "MouseAreaView.h"
#include "ScreenCornerSelector.h"
#include "Constants.h"
#include "Utility.h"
@ -32,7 +32,7 @@ scale_arrow(int x, int y, BRect area, bool invertX, bool invertY)
// #pragma mark -
MouseAreaView::MouseAreaView(BRect frame, const char *name, uint32 resizingMode)
ScreenCornerSelector::ScreenCornerSelector(BRect frame, const char *name, uint32 resizingMode)
: BView(frame, name, resizingMode, B_WILL_DRAW),
fCurrentCorner(NONE)
{
@ -41,7 +41,7 @@ MouseAreaView::MouseAreaView(BRect frame, const char *name, uint32 resizingMode)
void
MouseAreaView::Draw(BRect update)
ScreenCornerSelector::Draw(BRect update)
{
// Top of monitor
SetHighColor(kGrey);
@ -70,7 +70,7 @@ MouseAreaView::Draw(BRect update)
void
MouseAreaView::SetCorner(screen_corner corner)
ScreenCornerSelector::SetCorner(screen_corner corner)
{
fCurrentCorner = corner;
Invalidate();
@ -78,7 +78,7 @@ MouseAreaView::SetCorner(screen_corner corner)
BRect
MouseAreaView::_ArrowSize(BRect monitorRect, bool isCentered)
ScreenCornerSelector::_ArrowSize(BRect monitorRect, bool isCentered)
{
int arrowSize = monitorRect.IntegerWidth();
if (monitorRect.IntegerHeight() < arrowSize)
@ -97,7 +97,7 @@ MouseAreaView::_ArrowSize(BRect monitorRect, bool isCentered)
void
MouseAreaView::DrawArrow()
ScreenCornerSelector::DrawArrow()
{
PushState();
@ -135,7 +135,7 @@ MouseAreaView::DrawArrow()
void
MouseAreaView::MouseUp(BPoint point)
ScreenCornerSelector::MouseUp(BPoint point)
{
if (fMonitorFrame.Contains(point)) {
if (_ArrowSize(fMonitorFrame, true).Contains(point))

View File

@ -5,8 +5,8 @@
* Authors:
* Michael Phipps
*/
#ifndef MOUSEAREAVIEW_H
#define MOUSEAREAVIEW_H
#ifndef SCREEN_CORNER_SELECTOR_H
#define SCREEN_CORNER_SELECTOR_H
#include "ScreenSaverPrefs.h"
@ -14,9 +14,9 @@
#include <View.h>
class MouseAreaView : public BView {
class ScreenCornerSelector : public BView {
public:
MouseAreaView(BRect frame, const char *name, uint32 resizingMode);
ScreenCornerSelector(BRect frame, const char *name, uint32 resizingMode);
virtual void Draw(BRect update);
virtual void MouseUp(BPoint point);
@ -32,4 +32,4 @@ class MouseAreaView : public BView {
screen_corner fCurrentCorner;
};
#endif // MOUSEAREAVIEW_H
#endif // SCREEN_CORNER_SELECTOR_H

View File

@ -9,8 +9,8 @@
*/
#include "MouseAreaView.h"
#include "PreviewView.h"
#include "ScreenCornerSelector.h"
#include "ScreenSaverItem.h"
#include "ScreenSaverWindow.h"
@ -706,9 +706,9 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
// Bottom
box->AddChild(fFadeNow = new MouseAreaView(BRect(20,205,80,260),"fadeNow",
box->AddChild(fFadeNow = new ScreenCornerSelector(BRect(20,205,80,260),"fadeNow",
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
box->AddChild(fFadeNever = new MouseAreaView(BRect(220,205,280,260),"fadeNever",
box->AddChild(fFadeNever = new ScreenCornerSelector(BRect(220,205,280,260),"fadeNever",
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
stringView = new BStringView(BRect(90,215,193,230),

View File

@ -23,7 +23,7 @@
class BButton;
class ModulesView;
class MouseAreaView;
class ScreenCornerSelector;
class ScreenSaverRunner;
class TimeSlider;
@ -63,8 +63,8 @@ class ScreenSaverWindow : public BWindow {
BButton* fPasswordButton;
PasswordWindow* fPasswordWindow;
MouseAreaView* fFadeNow;
MouseAreaView* fFadeNever;
ScreenCornerSelector* fFadeNow;
ScreenCornerSelector* fFadeNever;
};
static const int32 kMsgUpdateList = 'UPDL';