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

Fixed bug where we scrolled in textbox and on map at the same time. (Bug #6334)

Browse source
This commit is contained in:
Danny Daemonic 2006-08-28 21:38:14 +00:00
parent 25b97e8a93
commit d2c92b72d7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/play_controller.cpp
View file

@ -603,16 +603,16 @@ void play_controller::play_slice()
const int scroll_threshold = (preferences::mouse_scroll_enabled()) ? 5 : 0; const int scroll_threshold = (preferences::mouse_scroll_enabled()) ? 5 : 0;
if(key[SDLK_UP] || mousey < scroll_threshold) if((key[SDLK_UP] && !menu_handler_.get_textbox().active()) || mousey < scroll_threshold)
gui_->scroll(0,-preferences::scroll_speed()); gui_->scroll(0,-preferences::scroll_speed());
if(key[SDLK_DOWN] || mousey > gui_->y()-scroll_threshold) if((key[SDLK_DOWN] && !menu_handler_.get_textbox().active()) || mousey > gui_->y()-scroll_threshold)
gui_->scroll(0,preferences::scroll_speed()); gui_->scroll(0,preferences::scroll_speed());
if(key[SDLK_LEFT] || mousex < scroll_threshold) if((key[SDLK_LEFT] && !menu_handler_.get_textbox().active()) || mousex < scroll_threshold)
gui_->scroll(-preferences::scroll_speed(),0); gui_->scroll(-preferences::scroll_speed(),0);
if(key[SDLK_RIGHT] || mousex > gui_->x()-scroll_threshold) if((key[SDLK_RIGHT] && !menu_handler_.get_textbox().active()) || mousex > gui_->x()-scroll_threshold)
gui_->scroll(preferences::scroll_speed(),0); gui_->scroll(preferences::scroll_speed(),0);
gui_->draw(); gui_->draw();