AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

emoji chooser: Fix incremental loading

Browse Source 
This broke when we started using GDK_PROFILER_CURRENT_TIME for
timekeeping - that gets defined to 0 when we're building without
sysprof, so we can use it to make such determinations. Go back
to using g_get_monotonic_time().

Fixes: #3438
This commit is contained in:
Matthias Clasen 2020-12-04 10:58:24 -05:00
parent d278afc85b
commit f0f64f42ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkemojichooser.c
View File

@ -672,7 +672,7 @@ populate_emoji_chooser (gpointer data)
GVariant *item;
gint64 start, now;
start = GDK_PROFILER_CURRENT_TIME;
start = g_get_monotonic_time ();
if (!chooser->data)
{
@ -718,10 +718,10 @@ populate_emoji_chooser (gpointer data)
add_emoji (chooser->box, FALSE, item, 0, chooser);
g_variant_unref (item);
now = GDK_PROFILER_CURRENT_TIME;
if (now > start + 2000000) /* 2 ms */
now = g_get_monotonic_time ();
if (now > start + 200) /* 2 ms */
{
gdk_profiler_add_mark (start, (now - start), "emojichooser", "populate");
gdk_profiler_add_mark (start * 1000, (now - start) * 1000, "emojichooser", "populate");
return G_SOURCE_CONTINUE;
}
}