Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update modifier keys window to take out cruft. 

I don't need to set the ExplicitMaxSize of the StringView's in
Modifier Keys anymore or calculate the widest label now that the
StringView's have an explicit alignment set. I used the old method
of SetAlignment(B_ALIGN_RIGHT) just because I can,
SetExplicitAlignment() should work too.
This commit is contained in:
John Scipione 2012-04-15 16:41:38 -04:00
parent afe43d0a55
commit 1cd97d5e86
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/preferences/keymap/ModifierKeysWindow.cpp
View File

@ -75,52 +75,30 @@ ModifierKeysWindow::ModifierKeysWindow()
get_key_map(&fSavedMap, &fSavedBuffer);
BStringView* keyRole = new BStringView("key role",
B_TRANSLATE_COMMENT("Key role",
"key roles, e.g. Control, Option, Command"));
B_TRANSLATE_COMMENT("Role", "As in the role of a modifier key"));
keyRole->SetAlignment(B_ALIGN_RIGHT);
keyRole->SetFont(be_bold_font);
BStringView* keyLabel = new BStringView("key label",
B_TRANSLATE_COMMENT("Key", "A computer keyboard key"));
B_TRANSLATE_COMMENT("Key", "As in a computer keyboard key"));
keyLabel->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
keyLabel->SetFont(be_bold_font);
float width = 0.0;
float widest = 0.0;
fShiftStringView = new BStringView("shift",
B_TRANSLATE_COMMENT("Shift:", "Shift key role name"));
fShiftStringView->SetAlignment(B_ALIGN_RIGHT);
width = fShiftStringView->StringWidth(fShiftStringView->Text());
if (width > widest)
widest = width;
fControlStringView = new BStringView("control",
B_TRANSLATE_COMMENT("Control:", "Control key role name"));
fControlStringView->SetAlignment(B_ALIGN_RIGHT);
width = fControlStringView->StringWidth(fControlStringView->Text());
if (width > widest)
widest = width;
fOptionStringView = new BStringView("option",
B_TRANSLATE_COMMENT("Option:", "Option key role name"));
fOptionStringView->SetAlignment(B_ALIGN_RIGHT);
width = fOptionStringView->StringWidth(fOptionStringView->Text());
if (width > widest)
widest = width;
fCommandStringView = new BStringView("command",
B_TRANSLATE_COMMENT("Command:", "Command key role name"));
fCommandStringView->SetAlignment(B_ALIGN_RIGHT);
width = fCommandStringView->StringWidth(fCommandStringView->Text());
if (width > widest)
widest = width;
// set the width of each of the string view's to the widest
fShiftStringView->SetExplicitMaxSize(BSize(widest, B_SIZE_UNSET));
fControlStringView->SetExplicitMaxSize(BSize(widest, B_SIZE_UNSET));
fOptionStringView->SetExplicitMaxSize(BSize(widest, B_SIZE_UNSET));
fCommandStringView->SetExplicitMaxSize(BSize(widest, B_SIZE_UNSET));
fShiftConflictView = new ConflictView("shift warning view");
fShiftConflictView->SetExplicitMaxSize(BSize(15, 15));