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

Rename controller_base::keyboard_scroll.

Browse source 
Rename to controller_base::apply_keyboard_scroll to avoid confusion
with hotkey_handler::keyboard_scroll.

keyboard_scroll handles the hotkey press and invokes
apply_keyboard_scroll on the controller.
This commit is contained in:
Ryan Roden-Corrent 2016-03-28 21:57:58 -04:00
parent a58e595705
commit 4e3d616336
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/controller_base.cpp
View file

@ -347,7 +347,7 @@ const config& controller_base::get_theme(const config& game_config, std::string
return empty;
}
void controller_base::keyboard_scroll(int x, int y)
void controller_base::apply_keyboard_scroll(int x, int y)
{
if (have_keyboard_focus()) {
// clamp between -1 and 1 so key repeats don't accelerate scrolling

2
src/controller_base.hpp
View file

@ -65,7 +65,7 @@ public:
static const config &get_theme(const config& game_config, std::string theme_name);
void keyboard_scroll(int x, int y);
void apply_keyboard_scroll(int x, int y);
protected:
virtual bool is_browsing() const
{ return false; }

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

@ -1368,7 +1368,7 @@ hotkey::command_executor * editor_controller::get_hotkey_command_executor() {
void editor_controller::keyboard_scroll(int x, int y)
{
controller_base::keyboard_scroll(x, y);
controller_base::apply_keyboard_scroll(x, y);
}
} //end namespace editor

2
src/hotkey/hotkey_handler.cpp
View file

@ -220,7 +220,7 @@ void play_controller::hotkey_handler::toggle_accelerated_speed()
void play_controller::hotkey_handler::keyboard_scroll(int x, int y)
{
play_controller_.keyboard_scroll(x, y);
play_controller_.apply_keyboard_scroll(x, y);
}
bool play_controller::hotkey_handler::execute_command(const hotkey::hotkey_command& cmd, int index, bool press)