From 68e9070df584f130049ffae96ffc8b5221f7cf74 Mon Sep 17 00:00:00 2001 From: Jan-Willem Harmannij Date: Wed, 22 Jan 2025 20:26:56 +0100 Subject: [PATCH 1/3] swipeable: Add (nullable) annotation on adw_swipeable_get_snap_points --- src/adw-swipeable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adw-swipeable.c b/src/adw-swipeable.c index 154585d81..0ca49bb8d 100644 --- a/src/adw-swipeable.c +++ b/src/adw-swipeable.c @@ -71,7 +71,7 @@ adw_swipeable_get_distance (AdwSwipeable *self) * Each snap point represents a progress value that is considered acceptable to * end the swipe on. * - * Returns: (array length=n_snap_points) (transfer full): the snap points + * Returns: (nullable) (array length=n_snap_points) (transfer full): the snap points */ double * adw_swipeable_get_snap_points (AdwSwipeable *self, -- GitLab From e54d2beeef7a04e6336e648df7961aff2ef8ba8a Mon Sep 17 00:00:00 2001 From: Jan-Willem Harmannij Date: Fri, 24 Jan 2025 21:21:20 +0100 Subject: [PATCH 2/3] swipeable: Revert d5fab66a, snap points are not nullable --- src/adw-swipeable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adw-swipeable.c b/src/adw-swipeable.c index 0ca49bb8d..154585d81 100644 --- a/src/adw-swipeable.c +++ b/src/adw-swipeable.c @@ -71,7 +71,7 @@ adw_swipeable_get_distance (AdwSwipeable *self) * Each snap point represents a progress value that is considered acceptable to * end the swipe on. * - * Returns: (nullable) (array length=n_snap_points) (transfer full): the snap points + * Returns: (array length=n_snap_points) (transfer full): the snap points */ double * adw_swipeable_get_snap_points (AdwSwipeable *self, -- GitLab From 84a55c54c7148d3c2edb2c9ba3b34ba84c11b227 Mon Sep 17 00:00:00 2001 From: Jan-Willem Harmannij Date: Fri, 24 Jan 2025 21:36:49 +0100 Subject: [PATCH 3/3] flap, overlay-split-view: Remove unreachable check in get_snap_points --- src/adw-flap.c | 3 --- src/adw-overlay-split-view.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/adw-flap.c b/src/adw-flap.c index 288879449..c7e6c01b5 100644 --- a/src/adw-flap.c +++ b/src/adw-flap.c @@ -1664,9 +1664,6 @@ adw_flap_get_snap_points (AdwSwipeable *swipeable, gboolean can_close = self->reveal_progress < 1 || self->swipe_to_close || self->swipe_active; double *points; - if (!can_open && !can_close) - return NULL; - if (can_open && can_close) { points = g_new0 (double, 2); diff --git a/src/adw-overlay-split-view.c b/src/adw-overlay-split-view.c index 76165b900..558516976 100644 --- a/src/adw-overlay-split-view.c +++ b/src/adw-overlay-split-view.c @@ -1224,9 +1224,6 @@ adw_overlay_split_view_get_snap_points (AdwSwipeable *swipeable, gboolean can_close = self->show_progress < 1 || self->enable_hide_gesture || self->swipe_active; double *points; - if (!can_open && !can_close) - return NULL; - if (can_open && can_close) { points = g_new0 (double, 2); -- GitLab