Skip to content

Fix build failing when defining signals with Gdk.ScrollEvent #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 4 commits into from
Jul 28, 2026
Merged

Fix build failing when defining signals with Gdk.ScrollEvent #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
493b7b7
Fix build failing when defining signals with Gdk.ScrollEvent
ryonakano Jul 27, 2026
6dabd76
Make sure scroll works
ryonakano Jul 28, 2026
5bf628a
Review variable name
ryonakano Jul 28, 2026
0c8ac4a
Improve comment
ryonakano Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,14 +328,16 @@ public class Sound.Indicator : Wingpanel.Indicator {
display_widget.icon_name = get_volume_icon (volume_control.volume.volume);
}

private void on_volume_icon_scroll_event (Gdk.ScrollEvent e) {
private void on_volume_icon_scroll_event (Value event_value) {
unowned var e = (Gdk.ScrollEvent) event_value.peek_pointer ();
double dir = 0.0;
if (handle_scroll_event (e, out dir)) {
handle_change (dir, false);
}
}

private void on_mic_icon_scroll_event (Gdk.ScrollEvent e) {
private void on_mic_icon_scroll_event (Value event_value) {
unowned var e = (Gdk.ScrollEvent) event_value.peek_pointer ();
double dir = 0.0;
if (handle_scroll_event (e, out dir)) {
handle_change (dir, true);
Expand Down Expand Up @@ -420,7 +422,8 @@ public class Sound.Indicator : Wingpanel.Indicator {
volume_control.mic_volume = mic_adjustment.get_value ();
});

mic_scale.scroll_event.connect_after ((e) => {
mic_scale.scroll_event.connect_after ((event_value) => {
unowned var e = (Gdk.ScrollEvent) event_value.peek_pointer ();
double dir = 0.0;
if (handle_scroll_event (e, out dir)) {
handle_change (dir, true);
Expand All @@ -443,7 +446,8 @@ public class Sound.Indicator : Wingpanel.Indicator {

volume_scale.slider_dropped.connect (play_volume_change_sound);

volume_scale.scroll_event.connect_after ((e) => {
volume_scale.scroll_event.connect_after ((event_value) => {
unowned var e = (Gdk.ScrollEvent) event_value.peek_pointer ();
double dir = 0.0;
if (handle_scroll_event (e, out dir)) {
handle_change (dir, false);
Expand Down
15 changes: 11 additions & 4 deletions src/Widgets/DisplayWidget.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ public class Sound.DisplayWidget : Gtk.Box {
public bool mic_muted { get; set; }
public string icon_name { get; set; }

public signal void volume_scroll_event (Gdk.ScrollEvent e);
public signal void mic_scroll_event (Gdk.ScrollEvent e);
// HACK: Using Gdk.ScrollEvent instead of Value as the type of the parameter
// resulsts build error with valac 0.56.18
// See https://gitlab.gnome.org/GNOME/vala/-/work_items/1671
public signal void volume_scroll_event (Value event_value);
public signal void mic_scroll_event (Value event_value);

construct {
var volume_icon = new Gtk.Image () {
Expand All @@ -50,7 +53,9 @@ public class Sound.DisplayWidget : Gtk.Box {
return Gdk.EVENT_PROPAGATE;
}

mic_scroll_event ((Gdk.ScrollEvent) e);
var event_value = Value (typeof (Gdk.ScrollEvent));
event_value.set_instance (e);
mic_scroll_event (event_value);
return Gdk.EVENT_STOP;
});

Expand All @@ -60,7 +65,9 @@ public class Sound.DisplayWidget : Gtk.Box {
return Gdk.EVENT_PROPAGATE;
}

volume_scroll_event ((Gdk.ScrollEvent) e);
var event_value = Value (typeof (Gdk.ScrollEvent));
event_value.set_instance (e);
volume_scroll_event (event_value);
return Gdk.EVENT_STOP;
});

Expand Down
9 changes: 7 additions & 2 deletions src/Widgets/Scale.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
*/

public class Sound.Widgets.Scale : Granite.Bin {
public signal void scroll_event (Gdk.ScrollEvent e);
// HACK: Using Gdk.ScrollEvent instead of Value as the type of the parameter
// resulsts build error with valac 0.56.18
// See https://gitlab.gnome.org/GNOME/vala/-/work_items/1671
public signal void scroll_event (Value event_value);
public signal void slider_dropped ();

public Gtk.Adjustment adjustment { get; construct; }
Expand Down Expand Up @@ -52,7 +55,9 @@ public class Sound.Widgets.Scale : Granite.Bin {
return Gdk.EVENT_PROPAGATE;
}

scroll_event ((Gdk.ScrollEvent) e);
var event_value = Value (typeof (Gdk.ScrollEvent));
event_value.set_instance (e);
scroll_event (event_value);

return Gdk.EVENT_STOP;
});
Expand Down
Loading