Merge branch 'dev' into work/v1.11

# Conflicts:
#	CMakeLists.txt
#	res/fonts/SmolEmoji-Regular.ttf
#	res/lang/gl.bin
#	src/app.c

1 files changed, 4 insertions, 1 deletions

diff --git a/src/ui/touch.c b/src/ui/touch.c
index 20ccf7b8..a178a913 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -638,11 +638,14 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 pixels.x = 0;
             }
 #if 0
-            printf("%p (%s) py: %i wy: %f acc: %f edge: %d\n",
+            static uint32_t lastTime = 0;
+            printf("%u :: %p (%s) py: %i wy: %f acc: %f edge: %d\n",
+                   nowTime - lastTime,
                    touch->affinity,
                    class_Widget(touch->affinity)->name,
                    pixels.y, y_F3(amount), y_F3(touch->accum),
                    touch->edge);
+            lastTime = nowTime;
 #endif
             if (pixels.x || pixels.y) {
                 //setFocus_Widget(NULL);