0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle scrolling hotkeys in editor.

Browse source
This commit is contained in:
Ryan Roden-Corrent 2016-03-27 22:06:53 -04:00
parent ae37341ab3
commit 419bf799ac
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/editor/controller/editor_controller.cpp
View file

@ -286,6 +286,10 @@ bool editor_controller::can_execute_command(const hotkey::hotkey_command& cmd, i
case HOTKEY_PREFERENCES:
case HOTKEY_HELP:
case HOTKEY_QUIT_GAME:
case HOTKEY_SCROLL_UP:
case HOTKEY_SCROLL_DOWN:
case HOTKEY_SCROLL_LEFT:
case HOTKEY_SCROLL_RIGHT:
return true; //general hotkeys we can always do
case hotkey::HOTKEY_UNIT_LIST:
@ -584,12 +588,18 @@ hotkey::ACTION_STATE editor_controller::get_action_state(hotkey::HOTKEY_COMMAND
}
}
bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int index)
bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int index, bool press)
{
const int zoom_amount = 4;
hotkey::HOTKEY_COMMAND command = cmd.id;
SCOPE_ED;
using namespace hotkey;
// nothing here handles release; fall through to base implementation
if (!press) {
return hotkey::command_executor::execute_command(cmd, index, press);
}
switch (command) {
case HOTKEY_NULL:
switch (active_menu_) {
@ -972,7 +982,7 @@ bool editor_controller::execute_command(const hotkey::hotkey_command& cmd, int i
gui().invalidate_all();
return true;
default:
return hotkey::command_executor::execute_command(cmd, index);
return hotkey::command_executor::execute_command(cmd, index, press);
}
}
@ -1356,4 +1366,9 @@ hotkey::command_executor * editor_controller::get_hotkey_command_executor() {
return this;
}
void editor_controller::keyboard_scroll(int x, int y)
{
controller_base::keyboard_scroll(x, y);
}
} //end namespace editor

5
src/editor/controller/editor_controller.hpp
View file

@ -107,7 +107,7 @@ class editor_controller : public controller_base,
hotkey::ACTION_STATE get_action_state(hotkey::HOTKEY_COMMAND command, int index) const;
/** command_executor override */
bool execute_command(const hotkey::hotkey_command& command, int index = -1);
bool execute_command(const hotkey::hotkey_command& command, int index = -1, bool press=true);
/** controller_base override */
void show_menu(const std::vector<std::string>& items_arg, int xloc, int yloc, bool context_menu, display& disp);
@ -118,6 +118,9 @@ class editor_controller : public controller_base,
/** Show the preferences dialog */
void preferences();
/** Handle hotkeys to scroll map */
void keyboard_scroll(int /*x*/, int /*y*/);
/** Grid toggle */
void toggle_grid();