Skip to content

Commit ebb2285

Browse files
sdroegebilelmoussaoui
authored andcommitted
gtk4: Mark gtk::GestureClick::unpaired-release sequence parameter as nullable
Fixes #1046
1 parent 946c3d2 commit ebb2285

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

gtk4/Gir.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ generate = [
113113
"Gtk.FontChooserLevel",
114114
"Gtk.FontChooserWidget",
115115
"Gtk.Frame",
116-
"Gtk.GestureClick",
117116
"Gtk.GestureDrag",
118117
"Gtk.GestureLongPress",
119118
"Gtk.GesturePan",
@@ -1229,6 +1228,16 @@ status = "generate"
12291228
name = "sequence"
12301229
const = true
12311230

1231+
[[object]]
1232+
name = "Gtk.GestureClick"
1233+
status = "generate"
1234+
# See https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4777
1235+
[[object.signal]]
1236+
name = "unpaired-release"
1237+
[[object.signal.parameter]]
1238+
name = "sequence"
1239+
nullable = true
1240+
12321241
[[object]]
12331242
name = "Gtk.GestureSingle"
12341243
status = "generate"

gtk4/src/auto/gesture_click.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,14 @@ impl GestureClick {
115115
}
116116

117117
#[doc(alias = "unpaired-release")]
118-
pub fn connect_unpaired_release<F: Fn(&Self, f64, f64, u32, &gdk::EventSequence) + 'static>(
118+
pub fn connect_unpaired_release<
119+
F: Fn(&Self, f64, f64, u32, Option<&gdk::EventSequence>) + 'static,
120+
>(
119121
&self,
120122
f: F,
121123
) -> SignalHandlerId {
122124
unsafe extern "C" fn unpaired_release_trampoline<
123-
F: Fn(&GestureClick, f64, f64, u32, &gdk::EventSequence) + 'static,
125+
F: Fn(&GestureClick, f64, f64, u32, Option<&gdk::EventSequence>) + 'static,
124126
>(
125127
this: *mut ffi::GtkGestureClick,
126128
x: libc::c_double,
@@ -135,7 +137,9 @@ impl GestureClick {
135137
x,
136138
y,
137139
button,
138-
&from_glib_borrow(sequence),
140+
Option::<gdk::EventSequence>::from_glib_borrow(sequence)
141+
.as_ref()
142+
.as_ref(),
139143
)
140144
}
141145
unsafe {

0 commit comments

Comments
 (0)