diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-06-01 12:25:20 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-01 12:25:20 +0000 |
| commit | b814970bdd1c02426567966093d56f103b1512a2 (patch) | |
| tree | d16c7aaf779b3dbc562c041064e26182b0abeb34 | |
| parent | 8dfbef5e6f910524667e09e8f92bf2569222a0ad (diff) | |
| parent | a36e2bc764ba493a07c982995e1f76eac53a9383 (diff) | |
| download | gtk+-b814970bdd1c02426567966093d56f103b1512a2.tar.gz | |
Merge branch 'fix-frameclock-going-backwards' into 'master'
Fix frameclock going backwards
See merge request GNOME/gtk!2011
| -rw-r--r-- | gdk/gdkframeclockidle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index bbb4e2d26e..ef32ad518a 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -236,7 +236,8 @@ gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock) /* can't change frame time during a paint */ if (priv->phase != GDK_FRAME_CLOCK_PHASE_NONE && - priv->phase != GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS) + priv->phase != GDK_FRAME_CLOCK_PHASE_FLUSH_EVENTS && + (priv->phase != GDK_FRAME_CLOCK_PHASE_BEFORE_PAINT || priv->in_paint_idle)) return priv->smoothed_frame_time_base; /* Outside a paint, pick something smoothed close to now */ |