Author: mir3x
Date: Mon Jan 9 11:15:51 2017
New Revision: 34808
URL: http://svn.gna.org/viewcvs/freeciv?rev=34808&view=rev
Log:
Qt client - allow keyboardless goto for units in stack
See patch #8064
Modified:
branches/S2_6/client/gui-qt/mapctrl.cpp
Modified: branches/S2_6/client/gui-qt/mapctrl.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/mapctrl.cpp?rev=34808&r1=34807&r2=34808&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/mapctrl.cpp (original)
+++ branches/S2_6/client/gui-qt/mapctrl.cpp Mon Jan 9 11:15:51 2017
@@ -385,7 +385,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;
}
@@ -422,7 +422,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
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
