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

KeyMap: Fix alignment of role labels

Browse Source 
... by setting all labels to take up the width of the longest label.

Fixes #10693
This commit is contained in:
John Scipione
2014-03-20 12:44:39 -04:00
parent 4a4e2dae77
commit 449d68282f
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/ModifierKeysWindow.cpp
+21 -1
View File
@@ -292,7 +292,27 @@ ModifierKeysWindow::ModifierKeysWindow()
// Build the layout // Build the layout
SetLayout(new BGroupLayout(B_VERTICAL)); SetLayout(new BGroupLayout(B_VERTICAL));
float forcedMinWidth = be_plain_font->StringWidth("XXX") * 4; // find the minimum width to fit the labels
float shiftLabelWidth
= shiftMenuField->StringWidth(shiftMenuField->Label());
float controlLabelWidth
= controlMenuField->StringWidth(controlMenuField->Label());
float optionLabelWidth
= optionMenuField->StringWidth(optionMenuField->Label());
float commandLabelWidth
= commandMenuField->StringWidth(commandMenuField->Label());
float forcedMinWidth = shiftLabelWidth;
if (controlLabelWidth > forcedMinWidth)
forcedMinWidth = controlLabelWidth;
if (optionLabelWidth > forcedMinWidth)
forcedMinWidth = optionLabelWidth;
if (commandLabelWidth > forcedMinWidth)
forcedMinWidth = commandLabelWidth;
forcedMinWidth += be_plain_font->StringWidth("XXX");
keyRole->SetExplicitMinSize(BSize(forcedMinWidth, B_SIZE_UNSET)); keyRole->SetExplicitMinSize(BSize(forcedMinWidth, B_SIZE_UNSET));
BLayoutItem* shiftLabel = shiftMenuField->CreateLabelLayoutItem(); BLayoutItem* shiftLabel = shiftMenuField->CreateLabelLayoutItem();