cpp/openttd-patchpack/source Changeset - r15421:b59b62f76cdb

Changeset - r15421:b59b62f76cdb

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 14 years ago 2010-07-04 11:28:16
yexo@openttd.org

(svn r20074) -Fix (r20065): highscore window should use the same hotkey for quit as the toolbar

3 files changed with 19 insertions and 5 deletions:

src/highscore_gui.cpp

src/hotkeys.h

src/main_gui.cpp

0 comments (0 inline, 0 general)

src/highscore_gui.cpp

➞

Show inline comments

@@ @@ -22,6 +22,7 @@ @@
 #include "company_base.h"
 #include "strings_func.h"
 #include "openttd.h"
 #include "hotkeys.h"
 enum HighscoreWidgets {
 	HSW_BACKGROUND,
@@ @@ -66,6 +67,11 @@ struct EndGameHighScoreBaseWindow : Wind @@
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
+	{
 		/* All keys are 'handled' by this window but we want to make
 		 * sure that 'quit' still works correctly. Not handling the
 		 * quit key is enough so the main toolbar can handle it. */
 		if (IsQuitKey(keycode)) return ES_NOT_HANDLED;
 		switch (keycode) {
 			/* Keys for telling we want to go on */
 			case WKC_RETURN:
@@ @@ -74,11 +80,6 @@ struct EndGameHighScoreBaseWindow : Wind @@
 				delete this;
 				return ES_HANDLED;
 			/* Allow CTRL-Q to work like ALT-F4 in all cases */
 			case 'Q' | WKC_CTRL:
 			case 'Q' | WKC_META:
 				return ES_NOT_HANDLED;
 			default:
 				/* We want to handle all keys; we don't want windows in
 				 * the background to open. Especially the ones that do

src/hotkeys.h

➞

Show inline comments

@@ @@ -124,6 +124,8 @@ int CheckHotkeyMatch(Hotkey<T> *list, ui @@
 	return -1;
+}
 bool IsQuitKey(uint16 keycode);
 void LoadHotkeysFromConfig();
 void SaveHotkeysToConfig();

src/main_gui.cpp

➞

Show inline comments

@@ @@ -467,6 +467,17 @@ Hotkey<MainWindow> MainWindow::global_ho @@
 };
 Hotkey<MainWindow> *_global_hotkeys = MainWindow::global_hotkeys;
 /**
  * Does the given keycode match one of the keycodes bound to 'quit game'?
  * @param keycode The keycode that was pressed by the user.
  * @return True iff the keycode matches one of the hotkeys for 'quit'.
  */
 bool IsQuitKey(uint16 keycode)
+{
 	int num = CheckHotkeyMatch<MainWindow>(_global_hotkeys, keycode, NULL);
 	return num == GHK_QUIT;
+}
 void ShowSelectGameWindow();

0 comments (0 inline, 0 general)