p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve looped animation behaviour

This commit is contained in:
Přemysl Eric Janouch 2023-06-24 02:22:44 +02:00
parent bb4d3acd12
commit 2ff853b7e0
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fiv-view.c
View File

@ -797,7 +797,6 @@ stop_animating(FivView *self)
self->frame_time = 0; self->frame_time = 0;
self->frame_update_connection = 0; self->frame_update_connection = 0;
self->remaining_loops = 0;
g_object_notify_by_pspec(G_OBJECT(self), view_properties[PROP_PLAYING]); g_object_notify_by_pspec(G_OBJECT(self), view_properties[PROP_PLAYING]);
} }
@ -866,7 +865,15 @@ start_animating(FivView *self)
self->frame_time = gdk_frame_clock_get_frame_time(clock); self->frame_time = gdk_frame_clock_get_frame_time(clock);
self->frame_update_connection = g_signal_connect( self->frame_update_connection = g_signal_connect(
clock, "update", G_CALLBACK(on_frame_clock_update), self); clock, "update", G_CALLBACK(on_frame_clock_update), self);
// Only restart looping the animation if it has stopped at the end.
if (!self->remaining_loops) {
self->remaining_loops = self->page->loops; self->remaining_loops = self->page->loops;
if (self->remaining_loops && !self->frame->frame_next) {
self->frame = self->page;
gtk_widget_queue_draw(GTK_WIDGET(self));
}
}
gdk_frame_clock_begin_updating(clock); gdk_frame_clock_begin_updating(clock);
g_object_notify_by_pspec(G_OBJECT(self), view_properties[PROP_PLAYING]); g_object_notify_by_pspec(G_OBJECT(self), view_properties[PROP_PLAYING]);
@ -884,6 +891,7 @@ switch_page(FivView *self, FivIoImage *page)
FivIoOrientationUnknown) FivIoOrientationUnknown)
self->orientation = FivIoOrientation0; self->orientation = FivIoOrientation0;
self->remaining_loops = 0;
start_animating(self); start_animating(self);
gtk_widget_queue_resize(GTK_WIDGET(self)); gtk_widget_queue_resize(GTK_WIDGET(self));
@ -1418,11 +1426,14 @@ static void
frame_step(FivView *self, int step) frame_step(FivView *self, int step)
{ {
stop_animating(self); stop_animating(self);
FivIoImage *frame = step < 0
? self->frame->frame_previous if (step > 0) {
: self->frame->frame_next; // Decrease the loop counter as if running on a timer.
if (!step || !(self->frame = frame)) (void) advance_frame(self);
} else if (!step || !(self->frame = self->frame->frame_previous)) {
self->frame = self->page; self->frame = self->page;
self->remaining_loops = 0;
}
gtk_widget_queue_draw(GTK_WIDGET(self)); gtk_widget_queue_draw(GTK_WIDGET(self));
} }