i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Screen savers are now sorted case insensitive (forgot to commit this before).

Browse Source 
* ScreenSavers is now completely font sensitive (but not the screen savers themselves,
  they are on their own there - note, however, that a screen saver can enlarge its
  view under Haiku (like it's already the case for Translators, even under BeOS)).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17862 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-06-16 19:07:00 +00:00
parent 9a3c8b14fd
commit 0248bb3ed8
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/screensaver/ScreenSaverWindow.cpp
+34 -9
View File
@@ -456,7 +456,7 @@ ModulesView::_CompareScreenSaverItems(const void* left, const void* right)
ScreenSaverItem* leftItem = *(ScreenSaverItem **)left;
ScreenSaverItem* rightItem = *(ScreenSaverItem **)right;
return strcmp(leftItem->Text(), rightItem->Text());
return strcasecmp(leftItem->Text(), rightItem->Text());
}
@@ -591,6 +591,8 @@ ScreenSaverWindow::ScreenSaverWindow()
fSettings.Load();
BRect rect = Bounds();
fMinWidth = 430;
fMinHeight = 325;
// Create a background view
BView *background = new BView(rect, "background", B_FOLLOW_ALL, 0);
@@ -614,9 +616,6 @@ ScreenSaverWindow::ScreenSaverWindow()
fPasswordWindow = new PasswordWindow(fSettings);
fPasswordWindow->Run();
// TODO: better limits!
fMinWidth = 430;
fMinHeight = 325;
SetMinimalSizeLimit(fMinWidth, fMinHeight);
MoveTo(fSettings.WindowFrame().left, fSettings.WindowFrame().top);
ResizeTo(fSettings.WindowFrame().Width(), fSettings.WindowFrame().Height());
@@ -716,34 +715,60 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
// Bottom
box->AddChild(fFadeNow = new ScreenCornerSelector(BRect(20,205,80,260), "FadeNow",
float monitorHeight = 10 + textHeight * 3;
float monitorWidth = monitorHeight * 4 / 3;
rect.left = 15;
rect.top = box->Bounds().Height() - 15 - monitorHeight;
rect.right = rect.left + monitorWidth;
rect.bottom = rect.top + monitorHeight;
box->AddChild(fFadeNow = new ScreenCornerSelector(rect, "FadeNow",
new BMessage(kMsgFadeCornerChanged), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
box->AddChild(fFadeNever = new ScreenCornerSelector(BRect(220,205,280,260), "FadeNever",
new BMessage(kMsgNeverFadeCornerChanged), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
rect = BRect(90,215,193,230);
rect.OffsetBy(monitorWidth + 10, 0);
stringView = new BStringView(rect, NULL, "Fade now when",
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
stringView->ResizeToPreferred();
float maxWidth = stringView->Bounds().Width();
box->AddChild(stringView);
rect.OffsetBy(0, stringView->Bounds().Height());
stringView = new BStringView(rect, NULL, "mouse is here",
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
stringView->ResizeToPreferred();
if (maxWidth < stringView->Bounds().Width())
maxWidth = stringView->Bounds().Width();
box->AddChild(stringView);
rect = BRect(290,215,387,230);
rect.left += maxWidth + 20;
rect.top = box->Bounds().Height() - 15 - monitorHeight;
rect.right = rect.left + monitorWidth;
rect.bottom = rect.top + monitorHeight;
box->AddChild(fFadeNever = new ScreenCornerSelector(rect, "FadeNever",
new BMessage(kMsgNeverFadeCornerChanged), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
rect.OffsetBy(monitorWidth + 10, 0);
stringView = new BStringView(rect, NULL,"Don't fade when",
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
stringView->ResizeToPreferred();
if (maxWidth < stringView->Bounds().Width())
maxWidth = stringView->Bounds().Width();
box->AddChild(stringView);
rect.OffsetBy(0, stringView->Bounds().Height());
stringView = new BStringView(rect, NULL, "mouse is here",
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
stringView->ResizeToPreferred();
if (maxWidth < stringView->Bounds().Width())
maxWidth = stringView->Bounds().Width();
box->AddChild(stringView);
float size = rect.left + maxWidth + 40;
if (fMinWidth < size)
fMinWidth = size;
size = fPasswordButton->Frame().bottom + box->Frame().top
+ monitorHeight + 40 + textHeight * 2;
if (fMinHeight < size)
fMinHeight = size;
}