[haiku-commits] r41208 - haiku/trunk/src/preferences/screensaver
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 9 Apr 2011 14:34:32 +0200 (CEST)
Author: humdinger
Date: 2011-04-09 14:34:32 +0200 (Sat, 09 Apr 2011)
New Revision: 41208
Changeset: https://dev.haiku-os.org/changeset/41208
Modified:
haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp
Log:
Aligned strings and sliders by pushing them a few pixels here and there. But
really, the whole app is in need of proper layouting using the layout API...
Modified: haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp
2011-04-09 12:21:04 UTC (rev 41207)
+++ haiku/trunk/src/preferences/screensaver/ScreenSaverWindow.cpp
2011-04-09 12:34:32 UTC (rev 41208)
@@ -683,9 +683,21 @@
{
fFadeView = new FadeView(rect, B_TRANSLATE("General"), fSettings);
- float labelWidth = be_plain_font->StringWidth(B_TRANSLATE("Turn off "
- "screen")) + 20.0f;
+ float StringWidth1 = be_plain_font->StringWidth(B_TRANSLATE
+ ("Start screensaver"));
+ float StringWidth2 = be_plain_font->StringWidth(B_TRANSLATE
+ ("Turn off screen"));
+ float StringWidth3 = be_plain_font->StringWidth(B_TRANSLATE
+ ("Password lock"));
+
+ float labelWidth = StringWidth1;
+ if (labelWidth < StringWidth2)
+ labelWidth = StringWidth2;
+ if (labelWidth < StringWidth3)
+ labelWidth = StringWidth3;
+ labelWidth += 20.0f;
+
font_height fontHeight;
be_plain_font->GetHeight(&fontHeight);
float textHeight = ceilf(fontHeight.ascent + fontHeight.descent);
@@ -704,8 +716,8 @@
box->SetLabel(fEnableCheckBox);
fFadeView->AddChild(box);
- // Run Module
- rect.left += radioButtonOffset;
+ // Start Screensaver
+ rect.left += radioButtonOffset + 6;
rect.top = fEnableCheckBox->Bounds().bottom + 8.0f;
rect.right = box->Bounds().right - 8;
BStringView* stringView = new BStringView(rect, NULL,
@@ -713,7 +725,7 @@
stringView->ResizeToPreferred();
box->AddChild(stringView);
- rect.left += labelWidth;
+ rect.left += labelWidth - 4;
fRunSlider = new TimeSlider(rect, "RunSlider", kMsgRunSliderChanged,
kMsgRunSliderUpdate);
float width, height;
@@ -722,13 +734,14 @@
box->AddChild(fRunSlider);
// Turn Off
- rect.left = 8;
+ rect.left = 10;
rect.OffsetBy(0, fRunSlider->Bounds().Height() + 4.0f);
fTurnOffCheckBox = new BCheckBox(rect, "TurnOffScreenCheckBox",
B_TRANSLATE("Turn off screen"), new
BMessage(kMsgTurnOffCheckBox));
fTurnOffCheckBox->ResizeToPreferred();
box->AddChild(fTurnOffCheckBox);
+ rect.top += 3;
rect.left += radioButtonOffset + labelWidth;
fTurnOffSlider = new TimeSlider(rect, "TurnOffSlider",
kMsgTurnOffSliderChanged, kMsgTurnOffSliderUpdate);
@@ -751,13 +764,14 @@
box->AddChild(fTurnOffNotSupported);
// Password
- rect.left = 8;
+ rect.left = 10;
rect.OffsetBy(0, fTurnOffSlider->Bounds().Height() + 4.0f);
fPasswordCheckBox = new BCheckBox(rect, "PasswordCheckbox",
B_TRANSLATE("Password lock"), new
BMessage(kMsgPasswordCheckBox));
fPasswordCheckBox->ResizeToPreferred();
box->AddChild(fPasswordCheckBox);
+ rect.top += 3;
rect.left += radioButtonOffset + labelWidth;
fPasswordSlider = new TimeSlider(rect, "PasswordSlider",
kMsgPasswordSliderChanged, kMsgPasswordSliderUpdate);
@@ -777,7 +791,7 @@
float monitorHeight = 10 + textHeight * 3;
float monitorWidth = monitorHeight * 4 / 3;
- rect.left = 15;
+ rect.left = 11;
rect.top = box->Bounds().Height() - 15 - monitorHeight;
rect.right = rect.left + monitorWidth;
rect.bottom = rect.top + monitorHeight;
Other related posts:
- » [haiku-commits] r41208 - haiku/trunk/src/preferences/screensaver - humdingerb
