(svn r20070) -Feature: when none of the open windows handles a keypress, try all toolbars for global hotkeys

Users that have run a version between r20056 and r20068 should delete their hotkeys.cfg to reset the terraform toolbar hotkeys to default
This commit is contained in:
yexo
2010-07-03 21:43:44 +00:00
parent 9be9302cdb
commit 26be68ae98
9 changed files with 91 additions and 28 deletions

View File

@@ -32,6 +32,7 @@
#include "strings_func.h"
#include "settings_type.h"
#include "newgrf_debug.h"
#include "hotkeys.h"
#include "table/sprites.h"
@@ -1955,7 +1956,9 @@ void HandleKeypress(uint32 raw_key)
w = FindWindowById(WC_MAIN_TOOLBAR, 0);
/* When there is no toolbar w is null, check for that */
if (w != NULL) w->OnKeyPress(key, keycode);
if (w != NULL && w->OnKeyPress(key, keycode) == ES_HANDLED) return;
HandleGlobalHotkeys(key, keycode);
}
/**