upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-06 22:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[[Mouse and scrolling fixes]]

Browse Source 
* Add a function to send a fake mouse motion to update the mouse
(cursor and effect on hex)

* Use it to update the highlighted hex after (middle and wheel) mouse
scrolling, without need to move the mouse anymore.
This commit is contained in:
Ali El Gariani 2007-04-08 01:00:01 +00:00
parent 2af1b8eb19
commit a489652dde
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mouse_events.cpp
View File

@ -696,6 +696,13 @@ void mouse_handler::mouse_motion(const SDL_MouseMotionEvent& event, const bool b
mouse_motion(event.x,event.y, browse);
}
void mouse_handler::mouse_update(const bool browse)
{
int x, y;
SDL_GetMouseState(&x,&y);
mouse_motion(x, y, browse);
}
void mouse_handler::mouse_motion(int x, int y, const bool browse)
{
if(minimap_scrolling_) {
@ -919,7 +926,7 @@ paths::route mouse_handler::get_route(unit_map::const_iterator un, gamemap::loca
void mouse_handler::mouse_press(const SDL_MouseButtonEvent& event, const bool browse)
{
show_menu_ = false;
mouse_motion(event.x, event.y, browse);
mouse_update(browse);
if(is_left_click(event) && event.state == SDL_RELEASED) {
minimap_scrolling_ = false;
@ -979,6 +986,7 @@ void mouse_handler::mouse_press(const SDL_MouseButtonEvent& event, const bool br
const int ydisp = event.y - centery;
gui_->scroll(xdisp,ydisp);
mouse_update(browse);
}
} else if((event.button == SDL_BUTTON_WHEELUP ||
event.button == SDL_BUTTON_WHEELDOWN) && !commands_disabled) {
@ -995,6 +1003,7 @@ void mouse_handler::mouse_press(const SDL_MouseButtonEvent& event, const bool br
gui_->scroll(speed,0);
else
gui_->scroll(0,speed);
mouse_update(browse);
}
if (!dragging_ && dragging_started_) {
dragging_started_ = false;
@ -1458,9 +1467,7 @@ inline void mouse_handler::select_unit(const unit_map::const_iterator &it,
current_route_.steps.clear();
gui_->set_route(NULL);
last_hex_=gamemap::location(-1,-1);
int mousex, mousey;
SDL_GetMouseState(&mousex, &mousey);
mouse_motion(mousex, mousey, true);
mouse_update(true);
show_attack_options(it);
game_events::fire("select",selected_hex_);
}

2
src/mouse_events.hpp
View File

@ -39,6 +39,8 @@ public:
gamestatus& status, const game_data& gameinfo, undo_list& undo_stack, undo_list& redo_stack);
void set_team(const int team_number);
void mouse_motion(const SDL_MouseMotionEvent& event, const bool browse);
// update the mouse with a fake mouse motion
void mouse_update(const bool browse);
void mouse_press(const SDL_MouseButtonEvent& event, const bool browse);
void cycle_units();
void cycle_back_units();