Screen: Undo hack to line up the top borders of the BBox's

Also, use font relative spacing units
This commit is contained in:
John Scipione 2013-05-30 20:39:23 -04:00
parent 39899cf662
commit 4666484ff2

View File

@ -505,18 +505,17 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
new BMessage(BUTTON_REVERT_MSG)); new BMessage(BUTTON_REVERT_MSG));
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
BLayoutBuilder::Group<>(this, B_VERTICAL, 10.0) BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
.SetInsets(10, 10, 10, 10) .AddGroup(B_VERTICAL, B_USE_DEFAULT_SPACING)
.AddGroup(B_HORIZONTAL, 10.0) .AddGroup(B_HORIZONTAL)
.AddGroup(B_VERTICAL)
.AddStrut(floor(controlsBox->TopBorderOffset() / 16) - 1)
.Add(screenBox) .Add(screenBox)
.End() .Add(controlsBox)
.Add(controlsBox) .End()
.End() .AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
.AddGroup(B_HORIZONTAL, 10.0) .Add(fRevertButton)
.Add(fRevertButton) .AddGlue()
.AddGlue(); .End()
.SetInsets(B_USE_DEFAULT_SPACING);
_UpdateControls(); _UpdateControls();
_UpdateMonitor(); _UpdateMonitor();