From 4008594db3ad6b4f679a11d9120ad14785a35ca6 Mon Sep 17 00:00:00 2001 From: Waldemar Kornewald Date: Sat, 10 Feb 2007 12:41:29 +0000 Subject: [PATCH] Fixed bug #1016 ('Apply' button overlaying Video Format Popup menu). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20122 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/screen/ScreenWindow.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp index bb8887f291..75ac879138 100644 --- a/src/preferences/screen/ScreenWindow.cpp +++ b/src/preferences/screen/ScreenWindow.cpp @@ -1107,8 +1107,10 @@ ScreenWindow::LayoutControls(uint32 flags) fControlsBox->MoveTo(fScreenBox->Frame().right + 10.0, 10.0); // layout the right side + fApplyButton->ResizeToPreferred(); BRect controlsRect = LayoutMenuFields(flags); controlsRect.InsetBy(-10.0, -10.0); + controlsRect.bottom += 8 + fApplyButton->Bounds().Height(); // adjust size of controls box and move aligned buttons along float xDiff = controlsRect.right - fControlsBox->Bounds().right; float yDiff = controlsRect.bottom - fControlsBox->Bounds().bottom; @@ -1138,11 +1140,10 @@ ScreenWindow::LayoutControls(uint32 flags) // fRevertButton->MoveTo(fDefaultsButton->Frame().right + 10, // fDefaultsButton->Frame().top); - fApplyButton->ResizeToPreferred(); + // Apply button was already resized above float resolutionFieldRight = fResolutionField->Frame().right; fApplyButton->MoveTo(resolutionFieldRight - fApplyButton->Bounds().Width(), - fControlsBox->Bounds().bottom - fApplyButton->Bounds().Height() - - (fControlsBox->Bounds().right - resolutionFieldRight)); + fControlsBox->Bounds().bottom - fApplyButton->Bounds().Height() - 10); ResizeTo(boxFrame.right + 10, fRevertButton->Frame().bottom + 10); }