From c1ae0faf95732da3ecafe8ce53a01098dbc14e2d Mon Sep 17 00:00:00 2001 From: Dino Date: Sun, 23 Aug 2026 00:10:07 -0400 Subject: [PATCH] gtk clients: remove obsolete code changing volume with shift & "+" key RM #1684 --- client/gui-gtk-3.22/gui_main.c | 27 --------------------------- client/gui-gtk-4.0/gui_main.c | 33 +-------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/client/gui-gtk-3.22/gui_main.c b/client/gui-gtk-3.22/gui_main.c index de3ba23dd3..c2540007fb 100644 --- a/client/gui-gtk-3.22/gui_main.c +++ b/client/gui-gtk-3.22/gui_main.c @@ -444,33 +444,6 @@ static gboolean key_press_map_canvas(GtkWidget *w, GdkEventKey *ev, } } - if (ev->state & GDK_SHIFT_MASK) { - bool volchange = FALSE; - - switch (ev->keyval) { - case GDK_KEY_KP_Add: - gui_options.sound_effects_volume += 10; - volchange = TRUE; - break; - - case GDK_KEY_KP_Subtract: - gui_options.sound_effects_volume -= 10; - volchange = TRUE; - break; - - default: - break; - } - - if (volchange) { - struct option *poption = optset_option_by_name(client_optset, "sound_effects_volume"); - - gui_options.sound_effects_volume = CLIP(0, gui_options.sound_effects_volume, 100); - option_changed(poption); - - return TRUE; - } - } if (!(ev->state & ACCL_MOD_KEY)) { switch (ev->keyval) { case GDK_KEY_KP_Add: diff --git a/client/gui-gtk-4.0/gui_main.c b/client/gui-gtk-4.0/gui_main.c index 0219346533..6637f3c3a4 100644 --- a/client/gui-gtk-4.0/gui_main.c +++ b/client/gui-gtk-4.0/gui_main.c @@ -435,38 +435,7 @@ static gboolean key_press_map_canvas(guint keyval, GdkModifierType state) } } - if (state & GDK_SHIFT_MASK) { - bool volchange = FALSE; - - switch (keyval) { - case GDK_KEY_plus: - case GDK_KEY_KP_Add: - gui_options.sound_effects_volume += 10; - volchange = TRUE; - break; - - case GDK_KEY_minus: - case GDK_KEY_KP_Subtract: - gui_options.sound_effects_volume -= 10; - volchange = TRUE; - break; - - default: - break; - } - - if (volchange) { - struct option *poption = optset_option_by_name(client_optset, - "sound_effects_volume"); - - gui_options.sound_effects_volume = CLIP(0, - gui_options.sound_effects_volume, - 100); - option_changed(poption); - - return TRUE; - } - } else if (!(state & GDK_CONTROL_MASK)) { + if (!(state & GDK_CONTROL_MASK)) { switch (keyval) { case GDK_KEY_KP_Add: zoom_step_up(); -- 2.31.0