diff options
| author | Tarek Soliman | 2011-12-30 15:51:08 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2011-12-30 15:52:40 -0600 |
| commit | b89bc000d96fce9d4e977b8ad59391282e35704e (patch) | |
| tree | 2616d9d4a3d4c4656fa4b13abb447793ea2b7a0f | |
| parent | 16d529cdc335feea858fde690fc1b3eae48449a2 (diff) | |
| download | scummvm-rg350-b89bc000d96fce9d4e977b8ad59391282e35704e.tar.gz scummvm-rg350-b89bc000d96fce9d4e977b8ad59391282e35704e.tar.bz2 scummvm-rg350-b89bc000d96fce9d4e977b8ad59391282e35704e.zip | |
KEYMAPPER: Remap dialog shows buttons before labels
| -rw-r--r-- | backends/keymapper/remap-dialog.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index 2039acf245..c0654fc0ea 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -170,7 +170,7 @@ void RemapDialog::reflowLayout() { if (i >= _keymapWidgets.size()) { widg.actionText = - new GUI::StaticTextWidget(this, 0, 0, 0, 0, "", Graphics::kTextAlignRight); + new GUI::StaticTextWidget(this, 0, 0, 0, 0, "", Graphics::kTextAlignLeft); widg.keyButton = new GUI::ButtonWidget(this, 0, 0, 0, 0, "", 0, kRemapCmd + i); widg.clearButton = addClearButton(this, "", kClearCmd + i, 0, 0, clearButtonWidth, clearButtonHeight); @@ -182,9 +182,10 @@ void RemapDialog::reflowLayout() { uint x = areaX; uint y = areaY + (i) * (buttonHeight + spacing); - widg.actionText->resize(x, y + textYOff, labelWidth, kLineHeight); - widg.keyButton->resize(x + labelWidth, y, keyButtonWidth, buttonHeight); - widg.clearButton->resize(x + labelWidth + keyButtonWidth + spacing, y + clearButtonYOff, clearButtonWidth, clearButtonHeight); + widg.keyButton->resize(x, y, keyButtonWidth, buttonHeight); + widg.clearButton->resize(x + keyButtonWidth + spacing, y + clearButtonYOff, clearButtonWidth, clearButtonHeight); + widg.actionText->resize(x + keyButtonWidth + spacing + clearButtonWidth + spacing, y + textYOff, labelWidth, kLineHeight); + } while (oldSize > newSize) { ActionWidgets widg = _keymapWidgets.remove_at(--oldSize); @@ -391,7 +392,7 @@ void RemapDialog::refreshKeymap() { debug(8, "RemapDialog::refreshKeymap actionI=%u", actionI); ActionInfo& info = _currentActions[actionI]; - widg.actionText->setLabel(info.description + ": "); + widg.actionText->setLabel(info.description); widg.actionText->setEnabled(!info.inherited); const HardwareKey *mappedKey = info.action->getMappedKey(); |