thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KEYMAPPER: Remap dialog shows buttons before labels

Browse source
This commit is contained in:
Tarek Soliman 2011-12-30 15:51:08 -06:00
parent 16d529cdc3
commit b89bc000d9
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backends/keymapper/remap-dialog.cpp
View file

@ -170,7 +170,7 @@ void RemapDialog::reflowLayout() {
if (i >= _keymapWidgets.size()) { if (i >= _keymapWidgets.size()) {
widg.actionText = widg.actionText =
new GUI::StaticTextWidget(this, 0, 0, 0, 0, "", Graphics::kTextAlignRight); new GUI::StaticTextWidget(this, 0, 0, 0, 0, "", Graphics::kTextAlignLeft);
widg.keyButton = widg.keyButton =
new GUI::ButtonWidget(this, 0, 0, 0, 0, "", 0, kRemapCmd + i); new GUI::ButtonWidget(this, 0, 0, 0, 0, "", 0, kRemapCmd + i);
widg.clearButton = addClearButton(this, "", kClearCmd + i, 0, 0, clearButtonWidth, clearButtonHeight); widg.clearButton = addClearButton(this, "", kClearCmd + i, 0, 0, clearButtonWidth, clearButtonHeight);
@ -182,9 +182,10 @@ void RemapDialog::reflowLayout() {
uint x = areaX; uint x = areaX;
uint y = areaY + (i) * (buttonHeight + spacing); uint y = areaY + (i) * (buttonHeight + spacing);
widg.actionText->resize(x, y + textYOff, labelWidth, kLineHeight); widg.keyButton->resize(x, y, keyButtonWidth, buttonHeight);
widg.keyButton->resize(x + labelWidth, y, keyButtonWidth, buttonHeight); widg.clearButton->resize(x + keyButtonWidth + spacing, y + clearButtonYOff, clearButtonWidth, clearButtonHeight);
widg.clearButton->resize(x + labelWidth + keyButtonWidth + spacing, y + clearButtonYOff, clearButtonWidth, clearButtonHeight); widg.actionText->resize(x + keyButtonWidth + spacing + clearButtonWidth + spacing, y + textYOff, labelWidth, kLineHeight);
} }
while (oldSize > newSize) { while (oldSize > newSize) {
ActionWidgets widg = _keymapWidgets.remove_at(--oldSize); ActionWidgets widg = _keymapWidgets.remove_at(--oldSize);
@ -391,7 +392,7 @@ void RemapDialog::refreshKeymap() {
debug(8, "RemapDialog::refreshKeymap actionI=%u", actionI); debug(8, "RemapDialog::refreshKeymap actionI=%u", actionI);
ActionInfo& info = _currentActions[actionI]; ActionInfo& info = _currentActions[actionI];
widg.actionText->setLabel(info.description + ": "); widg.actionText->setLabel(info.description);
widg.actionText->setEnabled(!info.inherited); widg.actionText->setEnabled(!info.inherited);
const HardwareKey *mappedKey = info.action->getMappedKey(); const HardwareKey *mappedKey = info.action->getMappedKey();