[libhandy] carousel: Switch to the new HdySwipeTracker API
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libhandy] carousel: Switch to the new HdySwipeTracker API
- Date: Fri, 26 Jun 2020 12:11:27 +0000 (UTC)
commit 6546a7c74b0472bf4437574b5f951499776cf086
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Sat Jun 20 15:55:08 2020 +0500
carousel: Switch to the new HdySwipeTracker API
Connect to HdySwipeTracker signals instead of implementing interface
functions.
Signed-off-by: Alexander Mikhaylenko <alexm gnome org>
src/hdy-carousel.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/hdy-carousel.c b/src/hdy-carousel.c
index 189e8b90..997ae87f 100644
--- a/src/hdy-carousel.c
+++ b/src/hdy-carousel.c
@@ -180,30 +180,28 @@ hdy_carousel_switch_child (HdySwipeable *swipeable,
}
static void
-hdy_carousel_begin_swipe (HdySwipeable *swipeable,
- HdyNavigationDirection direction,
- gboolean direct)
+begin_swipe_cb (HdySwipeTracker *tracker,
+ HdyNavigationDirection direction,
+ gboolean direct,
+ HdyCarousel *self)
{
- HdyCarousel *self = HDY_CAROUSEL (swipeable);
-
hdy_carousel_box_stop_animation (self->scrolling_box);
}
static void
-hdy_carousel_update_swipe (HdySwipeable *swipeable,
- gdouble value)
+update_swipe_cb (HdySwipeTracker *tracker,
+ gdouble progress,
+ HdyCarousel *self)
{
- HdyCarousel *self = HDY_CAROUSEL (swipeable);
-
- hdy_carousel_box_set_position (self->scrolling_box, value);
+ hdy_carousel_box_set_position (self->scrolling_box, progress);
}
static void
-hdy_carousel_end_swipe (HdySwipeable *swipeable,
- gint64 duration,
- gdouble to)
+end_swipe_cb (HdySwipeTracker *tracker,
+ gint64 duration,
+ gdouble to,
+ HdyCarousel *self)
{
- HdyCarousel *self = HDY_CAROUSEL (swipeable);
GtkWidget *child;
child = hdy_carousel_box_get_page_at_position (self->scrolling_box, to);
@@ -917,9 +915,6 @@ static void
hdy_carousel_swipeable_init (HdySwipeableInterface *iface)
{
iface->switch_child = hdy_carousel_switch_child;
- iface->begin_swipe = hdy_carousel_begin_swipe;
- iface->update_swipe = hdy_carousel_update_swipe;
- iface->end_swipe = hdy_carousel_end_swipe;
iface->get_distance = hdy_carousel_get_distance;
iface->get_range = hdy_carousel_get_range;
iface->get_snap_points = hdy_carousel_get_snap_points;
@@ -1161,6 +1156,11 @@ hdy_carousel_init (HdyCarousel *self)
self->tracker = hdy_swipe_tracker_new (HDY_SWIPEABLE (self));
hdy_swipe_tracker_set_allow_mouse_drag (self->tracker, TRUE);
+
+ g_signal_connect_object (self->tracker, "begin-swipe", G_CALLBACK (begin_swipe_cb), self, 0);
+ g_signal_connect_object (self->tracker, "update-swipe", G_CALLBACK (update_swipe_cb), self, 0);
+ g_signal_connect_object (self->tracker, "end-swipe", G_CALLBACK (end_swipe_cb), self, 0);
+
self->can_scroll = TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]