From 5bb34df0a8bd8fbd6bf468e00e05eb9e6551678f Mon Sep 17 00:00:00 2001 From: shatty Date: Tue, 16 Sep 2003 01:13:15 +0000 Subject: [PATCH] improved font sensitivity git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4702 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/prefs/screen/ScreenWindow.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/prefs/screen/ScreenWindow.cpp b/src/prefs/screen/ScreenWindow.cpp index 1774a8079c..774b78e3d6 100644 --- a/src/prefs/screen/ScreenWindow.cpp +++ b/src/prefs/screen/ScreenWindow.cpp @@ -138,24 +138,27 @@ ScreenWindow::ScreenWindow(ScreenSettings *Settings) CheckUpdateDisplayModes(); - BRect controlMenuRect(33.0, 30.0, 171.0, 48.0); - fResolutionField = new BMenuField(controlMenuRect, "ResolutionMenu", "Resolution:", fResolutionMenu, true); + const char * resolutionLabel = "Resolution: "; + float resolutionWidth = controlsBox->StringWidth(resolutionLabel); + BRect controlMenuRect(88.0-resolutionWidth, 30.0, 171.0, 48.0); + fResolutionField = new BMenuField(controlMenuRect, "ResolutionMenu", resolutionLabel, fResolutionMenu, true); marked = fResolutionMenu->ItemAt(0); marked->SetMarked(true); - fResolutionField->SetDivider(55.0); + fResolutionField->SetDivider(resolutionWidth); controlsBox->AddChild(fResolutionField); - controlMenuRect.Set(50.0, 58.0, 171.0, 76.0); - - fColorsField = new BMenuField(controlMenuRect, "ColorsMenu", "Colors:", fColorsMenu, true); + const char * colorsLabel = "Colors: "; + float colorsWidth = controlsBox->StringWidth(colorsLabel); + controlMenuRect.Set(88.0-colorsWidth, 58.0, 171.0, 76.0); + fColorsField = new BMenuField(controlMenuRect, "ColorsMenu", colorsLabel, fColorsMenu, true); marked = fColorsMenu->ItemAt(0); marked->SetMarked(true); - fColorsField->SetDivider(38.0); + fColorsField->SetDivider(colorsWidth); controlsBox->AddChild(fColorsField); @@ -173,14 +176,15 @@ ScreenWindow::ScreenWindow(ScreenSettings *Settings) fRefreshMenu->AddItem(new BMenuItem("Other...", new BMessage(POP_OTHER_REFRESH_MSG))); - controlMenuRect.Set(19.0, 86.0, 171.0, 104.0); - - fRefreshField = new BMenuField(controlMenuRect, "RefreshMenu", "Refresh Rate:", fRefreshMenu, true); + const char * refreshLabel = "Refresh Rate: "; + float refreshWidth = controlsBox->StringWidth(refreshLabel); + controlMenuRect.Set(88.0-refreshWidth, 86.0, 171.0, 104.0); + fRefreshField = new BMenuField(controlMenuRect, "RefreshMenu", refreshLabel, fRefreshMenu, true); marked = fRefreshMenu->FindItem("60 Hz"); marked->SetMarked(true); - fRefreshField->SetDivider(69.0); + fRefreshField->SetDivider(refreshWidth); controlsBox->AddChild(fRefreshField);