Author: cazfi Date: Thu Feb 23 06:00:12 2017 New Revision: 35060 URL: http://svn.gna.org/viewcvs/freeciv?rev=35060&view=rev Log: Fixed zoom out and in to work when '+' or '-' require 'shift'
Reported by Jochen Trumpf <jochent> See gna bug #25237 Modified: trunk/client/gui-gtk-3.0/gui_main.c trunk/client/gui-gtk-3.22/gui_main.c Modified: trunk/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=35060&r1=35059&r2=35060&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/gui_main.c (original) +++ trunk/client/gui-gtk-3.0/gui_main.c Thu Feb 23 06:00:12 2017 @@ -485,8 +485,14 @@ } } else if (!(ev->state & GDK_CONTROL_MASK)) { switch (ev->keyval) { + default: + break; + } + } #ifdef GTK3_ZOOM_ENABLED + if (!(ev->state & GDK_CONTROL_MASK)) { + switch (ev->keyval) { case GDK_KEY_plus: zoom_step_up(); return TRUE; @@ -494,12 +500,12 @@ case GDK_KEY_minus: zoom_step_down(); return TRUE; -#endif /* GTK3_ZOOM_ENABLED */ default: break; } } +#endif /* GTK3_ZOOM_ENABLED */ /* Return here if observer */ if (client_is_observer()) { Modified: trunk/client/gui-gtk-3.22/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/gui_main.c?rev=35060&r1=35059&r2=35060&view=diff ============================================================================== --- trunk/client/gui-gtk-3.22/gui_main.c (original) +++ trunk/client/gui-gtk-3.22/gui_main.c Thu Feb 23 06:00:12 2017 @@ -467,8 +467,14 @@ } } else if (!(ev->state & GDK_CONTROL_MASK)) { switch (ev->keyval) { + default: + break; + } + } #ifdef GTK3_ZOOM_ENABLED + if (!(ev->state & GDK_CONTROL_MASK)) { + switch (ev->keyval) { case GDK_KEY_plus: zoom_step_up(); return TRUE; @@ -476,12 +482,12 @@ case GDK_KEY_minus: zoom_step_down(); return TRUE; -#endif /* GTK3_ZOOM_ENABLED */ default: break; } } +#endif /* GTK3_ZOOM_ENABLED */ /* Return here if observer */ if (client_is_observer()) { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits