Author: mir3x
Date: Mon Jan  9 11:16:26 2017
New Revision: 34809

URL: http://svn.gna.org/viewcvs/freeciv?rev=34809&view=rev
Log:
Qt client - allow keyboardless goto for units in stack

See patch #8064


Modified:
    branches/S3_0/client/gui-qt/mapctrl.cpp

Modified: branches/S3_0/client/gui-qt/mapctrl.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/mapctrl.cpp?rev=34809&r1=34808&r2=34809&view=diff
==============================================================================
--- branches/S3_0/client/gui-qt/mapctrl.cpp     (original)
+++ branches/S3_0/client/gui-qt/mapctrl.cpp     Mon Jan  9 11:16:26 2017
@@ -387,7 +387,7 @@
   }
   sc = fc_shortcuts::sc()->get_shortcut(SC_SELECT_BUTTON);
   if (((key && key == sc->key) || bt == sc->mouse) && md == sc->mod) {
-    action_button_pressed(pos.x(), pos.y(), SELECT_POPUP);
+    action_button_pressed(pos.x(), pos.y(), SELECT_FOCUS);
     return;
   }
 
@@ -424,7 +424,11 @@
 
   sc = fc_shortcuts::sc()->get_shortcut(SC_SELECT_BUTTON);
   if (bt == sc->mouse && md == sc->mod) {
-    release_goto_button(pos.x(), pos.y());
+    if (keyboardless_goto_active) {
+      release_goto_button(pos.x(), pos.y());
+    } else {
+      action_button_pressed(pos.x(), pos.y(), SELECT_POPUP);
+    }
     return;
   }
 }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to