From 8c044d0852dc9d0d8799b4f8376cc11057410486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Mon, 15 Jul 2019 14:27:35 +0200 Subject: [PATCH] keyboard: Schedule widget redraw instead of gdk_window_invalidate_rect The later would invaliate the drawn area again and again in a ::draw() handler. This caused infinite redraws when e.g. a key was locked. To reproduce break e.g. on `eek_gtk_keyboard_real_draw()` and see how it is invoked again and again. --- eek/eek-gtk-keyboard.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c index 436e754e..913a0567 100644 --- a/eek/eek-gtk-keyboard.c +++ b/eek/eek-gtk-keyboard.c @@ -558,9 +558,6 @@ render_pressed_key (GtkWidget *widget, gdk_window_end_draw_frame (window, context); cairo_region_destroy (region); - - /* force immediate drawing of the backbuffer to the screen */ - gdk_window_invalidate_rect (window, &dirty_rect, FALSE); } static void @@ -590,9 +587,6 @@ render_locked_key (GtkWidget *widget, gdk_window_end_draw_frame (window, context); cairo_region_destroy (region); - - /* force immediate drawing of the backbuffer to the screen */ - gdk_window_invalidate_rect (window, &dirty_rect, FALSE); } static void @@ -622,9 +616,6 @@ render_released_key (GtkWidget *widget, gdk_window_end_draw_frame (window, context); cairo_region_destroy (region); - - /* force immediate drawing of the backbuffer to the screen */ - gdk_window_invalidate_rect (window, &dirty_rect, FALSE); } static void @@ -638,6 +629,7 @@ on_key_pressed (EekKey *key, return; render_pressed_key (GTK_WIDGET(self), key); + gtk_widget_queue_draw (GTK_WIDGET(self)); #if HAVE_LIBCANBERRA ca_gtk_play_for_widget (widget, 0, @@ -659,6 +651,7 @@ on_key_released (EekKey *key, return; render_released_key (GTK_WIDGET(self), key); + gtk_widget_queue_draw (GTK_WIDGET(self)); #if HAVE_LIBCANBERRA ca_gtk_play_for_widget (widget, 0, @@ -682,6 +675,7 @@ on_key_locked (EekKeyboard *keyboard, return; render_locked_key (widget, key); + gtk_widget_queue_draw (widget); } static void @@ -697,6 +691,7 @@ on_key_unlocked (EekKeyboard *keyboard, return; render_released_key (widget, key); + gtk_widget_queue_draw (GTK_WIDGET(widget)); } static void