diff options
| -rw-r--r-- | backends/keymapper/remap-dialog.cpp | 7 | ||||
| -rw-r--r-- | gui/theme-config.cpp | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp index a6917fea7d..09d976a766 100644 --- a/backends/keymapper/remap-dialog.cpp +++ b/backends/keymapper/remap-dialog.cpp @@ -31,7 +31,8 @@ namespace Common { enum { - kRemapCmd = 'REMP' + kRemapCmd = 'REMP', + kCloseCmd = 'CLOS' }; RemapDialog::RemapDialog() @@ -44,6 +45,8 @@ RemapDialog::RemapDialog() _kmPopUp = new GUI::PopUpWidget(this, "remap_popup", "Keymap: ", labelWidth); _scrollBar = new GUI::ScrollBarWidget(this, 0, 0, 0, 0); + + new GUI::ButtonWidget(this, "remap_close_button", "Close", kCloseCmd); } RemapDialog::~RemapDialog() { @@ -181,6 +184,8 @@ void RemapDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 d loadKeymap(); } else if (cmd == GUI::kSetPositionCmd) { refreshKeymap(); + } else if (cmd == kCloseCmd) { + close(); } else { GUI::Dialog::handleCommand(sender, cmd, data); } diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index 48a93ca285..9d417c9c2e 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -377,9 +377,10 @@ const char *Theme::_defaultConfigINI = "remap=(w / 4) (h / 4) (w / 2) (h / 2)\n" "remap_spacing=10\n" "remap_popup=remap_spacing remap_spacing (prev.w - remap_spacing * 2) (kLineHeight + 2)\n" -"remap_popup_labelW=buttonWidth\n" +"remap_popup_labelW=kButtonWidth\n" "remap_col_count=2\n" -"remap_keymap_area=remap_spacing (remap_popup.y + remap_popup.h + remap_spacing) (remap.w - remap_spacing * 2) (remap.h - self.y - remap_spacing)\n" +"remap_keymap_area=remap_spacing (remap_popup.y + remap_popup.h + remap_spacing) (remap.w - remap_spacing * 2) (remap.h - self.y - remap_spacing * 2 - kBigButtonHeight)\n" +"remap_close_button=((remap.w - kButtonWidth) / 2) (prev.y + prev.h + remap_spacing) kButtonWidth kBigButtonHeight\n" "############################################\n" "[chooser]\n" "chooserW=(w - 2 * 8)\n" |