[Freeorion-programmers] SF.net SVN: freeorion:[5894] trunk/FreeOrion/GG/src/GUI.cpp

[<geo...@us...>]

Revision: 5894
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5894&view=rev
Author:   geoffthemedio
Date:     2013-03-22 09:56:24 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
Enabled mousewheel events while mouse buttons are held down in GG. Might lead to some map zoom quirks, but those should be fixable, and the functionality is useful.

Modified Paths:
--------------
    trunk/FreeOrion/GG/src/GUI.cpp

Modified: trunk/FreeOrion/GG/src/GUI.cpp
===================================================================
--- trunk/FreeOrion/GG/src/GUI.cpp	2013-03-22 09:53:54 UTC (rev 5893)
+++ trunk/FreeOrion/GG/src/GUI.cpp	2013-03-22 09:56:24 UTC (rev 5894)
@@ -781,8 +781,8 @@
         s_impl->m_browse_info_wnd.reset();
         s_impl->m_browse_target = 0;
         s_impl->m_prev_wnd_under_cursor_time = curr_ticks;
-        // don't send out 0-movement wheel messages, or send wheel messages when a button is depressed
-        if (s_impl->m_curr_wnd_under_cursor && rel.y && !(s_impl->m_button_state[0] || s_impl->m_button_state[1] || s_impl->m_button_state[2]))
+        // don't send out 0-movement wheel messages
+        if (s_impl->m_curr_wnd_under_cursor && rel.y)
             s_impl->m_curr_wnd_under_cursor->HandleEvent(WndEvent(WndEvent::MouseWheel, pos, Value(rel.y), mod_keys));
         s_impl->m_prev_wnd_under_cursor = s_impl->m_curr_wnd_under_cursor; // update this for the next time around
         break; }