dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 16:02:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from Rafostar/scroll-fixes

Browse Source 
Scroll fixes
This commit is contained in:
Rafał Dzięgiel
2024-04-13 14:28:23 +02:00
committed by GitHub
parent 4baade3b32 c327734ca6
commit 42fa31cc4b
3 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/clapper-app/clapper-app-window.c
View File

@@ -471,19 +471,22 @@ scroll_cb (GtkEventControllerScroll *scroll,
pickup = _pick_pointer_widget (self);
/* We do not want to accidentally allow this controller
* to handle scrolls when hovering over scrolled window */
if (pickup && (GTK_IS_SCROLLED_WINDOW (pickup)
|| gtk_widget_get_ancestor (pickup, GTK_TYPE_SCROLLED_WINDOW)))
/* We do not want to accidentally allow this controller to handle
* scrolls when hovering over widgets that also handle scroll */
while (pickup && !CLAPPER_GTK_IS_VIDEO (pickup)) {
if (GTK_IS_SCROLLED_WINDOW (pickup) || GTK_IS_RANGE (pickup))
return FALSE;
pickup = gtk_widget_get_parent (pickup);
}
device = gtk_event_controller_get_current_event_device (GTK_EVENT_CONTROLLER (scroll));
switch (gdk_device_get_source (device)) {
case GDK_SOURCE_TOUCHPAD:
case GDK_SOURCE_TOUCHSCREEN:
dx *= -0.4;
dy *= -0.4;
dx *= 0.4;
dy *= 0.4;
break;
default:
break;

38
src/lib/clapper-gtk/clapper-gtk-seek-bar.c
View File

@@ -55,6 +55,9 @@ struct _ClapperGtkSeekBar
gboolean has_hours;
gboolean has_markers;
gboolean can_scrub;
gboolean scrubbing;
gboolean dragging;
guint position_uint;
@@ -288,6 +291,38 @@ scale_css_classes_changed_cb (GtkWidget *widget,
}
}
static void
scale_scroll_begin_cb (GtkEventControllerScroll *scroll, ClapperGtkSeekBar *self)
{
self->can_scrub = TRUE;
}
static gboolean
scale_scroll_cb (GtkEventControllerScroll *scroll,
gdouble dx, gdouble dy, ClapperGtkSeekBar *self)
{
if (self->can_scrub && !self->scrubbing) {
GST_DEBUG_OBJECT (self, "Scrubbing start");
self->scrubbing = TRUE;
gtk_widget_add_css_class (self->scale, "dragging");
return TRUE;
}
return FALSE;
}
static void
scale_scroll_end_cb (GtkEventControllerScroll *scroll, ClapperGtkSeekBar *self)
{
if (self->scrubbing) {
GST_DEBUG_OBJECT (self, "Scrubbing end");
gtk_widget_remove_css_class (self->scale, "dragging");
self->scrubbing = FALSE;
}
self->can_scrub = FALSE;
}
static void
motion_cb (GtkEventControllerMotion *motion,
gdouble x, gdouble y, ClapperGtkSeekBar *self)
@@ -773,6 +808,9 @@ clapper_gtk_seek_bar_class_init (ClapperGtkSeekBarClass *klass)
gtk_widget_class_bind_template_callback (widget_class, scale_value_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, scale_css_classes_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, scale_scroll_begin_cb);
gtk_widget_class_bind_template_callback (widget_class, scale_scroll_cb);
gtk_widget_class_bind_template_callback (widget_class, scale_scroll_end_cb);
gtk_widget_class_bind_template_callback (widget_class, motion_cb);
gtk_widget_class_bind_template_callback (widget_class, motion_leave_cb);
gtk_widget_class_bind_template_callback (widget_class, touch_released_cb);

9
src/lib/clapper-gtk/ui/clapper-gtk-seek-bar.ui
View File

@@ -29,6 +29,15 @@
<property name="adjustment">position_adjustment</property>
<signal name="value-changed" handler="scale_value_changed_cb"/>
<signal name="notify::css-classes" handler="scale_css_classes_changed_cb"/>
<child>
<object class="GtkEventControllerScroll">
<property name="propagation-phase">capture</property>
<property name="flags">both-axes</property>
<signal name="scroll-begin" handler="scale_scroll_begin_cb"/>
<signal name="scroll" handler="scale_scroll_cb"/>
<signal name="scroll-end" handler="scale_scroll_end_cb"/>
</object>
</child>
</object>
</child>
<child>