From 8660392f4f4f94094ab68ca7920d940b51b2acc4 Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 3 Mar 2020 11:52:46 +0100 Subject: libslab: Remove libslab_get_current_time_millis --- libslab/double-click-detector.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'libslab/double-click-detector.c') diff --git a/libslab/double-click-detector.c b/libslab/double-click-detector.c index 64ed58e8..e6874d11 100644 --- a/libslab/double-click-detector.c +++ b/libslab/double-click-detector.c @@ -26,6 +26,8 @@ G_DEFINE_TYPE (DoubleClickDetector, double_click_detector, G_TYPE_OBJECT); +void double_click_detector_update_click_time (DoubleClickDetector * detector, guint32 event_time); + static void double_click_detector_class_init (DoubleClickDetectorClass * detector_class) { @@ -41,7 +43,7 @@ double_click_detector_init (DoubleClickDetector * detector) g_object_get (G_OBJECT (settings), "gtk-double-click-time", &click_interval, NULL); - detector->double_click_time = (guint32) click_interval; + detector->double_click_time = (gint32) click_interval; detector->last_click_time = 0; } @@ -57,17 +59,17 @@ double_click_detector_is_double_click (DoubleClickDetector *this, guint32 event_ { gint32 delta; - if (event_time <= 0) - event_time = libslab_get_current_time_millis (); + if (event_time == 0) + event_time = (guint32) (g_get_monotonic_time () / 1000); /* milliseconds */ - if (this->last_click_time <= 0) { + if (this->last_click_time == 0) { if (auto_update) double_click_detector_update_click_time (this, event_time); return FALSE; } - delta = event_time - this->last_click_time; + delta = (gint32) event_time - (gint32) this->last_click_time; if (auto_update) double_click_detector_update_click_time (this, event_time); @@ -78,8 +80,8 @@ double_click_detector_is_double_click (DoubleClickDetector *this, guint32 event_ void double_click_detector_update_click_time (DoubleClickDetector *this, guint32 event_time) { - if (event_time <= 0) - event_time = libslab_get_current_time_millis (); + if (event_time == 0) + event_time = (guint32) (g_get_monotonic_time () / 1000); /* milliseconds */ this->last_click_time = event_time; } -- cgit v1.2.1