[gtk/selectable-label-draw] label: Redraw when focus changes

[Matthias Clasen <matthiasc src gnome org>]

commit e649288979a774407104f6c778759c79b337dada
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 2 11:24:27 2020 -0400

    label: Redraw when focus changes
    
    When focus changes in a selectable label, we need to
    redraw to make the text caret (dis)appear.

 gtk/gtklabel.c | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index c39699fed1..c565afaca5 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -31,6 +31,7 @@
 #include "gtkcssnodeprivate.h"
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkeventcontrollermotion.h"
+#include "gtkeventcontrollerfocus.h"
 #include "gtkgesturedrag.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
@@ -359,6 +360,7 @@ struct _GtkLabelSelectionInfo
   GtkGesture *drag_gesture;
   GtkGesture *click_gesture;
   GtkEventController *motion_controller;
+  GtkEventController *focus_controller;
 
   int drag_start_x;
   int drag_start_y;
@@ -4403,6 +4405,13 @@ gtk_label_content_init (GtkLabelContent *content)
 {
 }
 
+static void
+focus_change (GtkEventControllerFocus *controller,
+              GtkLabel                *self)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
 static void
 gtk_label_ensure_select_info (GtkLabel *self)
 {
@@ -4412,13 +4421,12 @@ gtk_label_ensure_select_info (GtkLabel *self)
 
       gtk_widget_set_focusable (GTK_WIDGET (self), TRUE);
 
-      self->select_info->drag_gesture = gtk_gesture_drag_new ();
-      g_signal_connect (self->select_info->drag_gesture, "drag-begin",
-                        G_CALLBACK (gtk_label_drag_gesture_begin), self);
-      g_signal_connect (self->select_info->drag_gesture, "drag-update",
-                        G_CALLBACK (gtk_label_drag_gesture_update), self);
-      gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (self->select_info->drag_gesture), TRUE);
-      gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (self->select_info->drag_gesture));
+      self->select_info->motion_controller = gtk_event_controller_motion_new ();
+      g_signal_connect (self->select_info->motion_controller, "motion",
+                        G_CALLBACK (gtk_label_motion), self);
+      g_signal_connect (self->select_info->motion_controller, "leave",
+                        G_CALLBACK (gtk_label_leave), self);
+      gtk_widget_add_controller (GTK_WIDGET (self), self->select_info->motion_controller);
 
       self->select_info->click_gesture = gtk_gesture_click_new ();
       g_signal_connect (self->select_info->click_gesture, "pressed",
@@ -4429,12 +4437,20 @@ gtk_label_ensure_select_info (GtkLabel *self)
       gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (self->select_info->click_gesture), TRUE);
       gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (self->select_info->click_gesture));
 
-      self->select_info->motion_controller = gtk_event_controller_motion_new ();
-      g_signal_connect (self->select_info->motion_controller, "motion",
-                        G_CALLBACK (gtk_label_motion), self);
-      g_signal_connect (self->select_info->motion_controller, "leave",
-                        G_CALLBACK (gtk_label_leave), self);
-      gtk_widget_add_controller (GTK_WIDGET (self), self->select_info->motion_controller);
+      self->select_info->drag_gesture = gtk_gesture_drag_new ();
+      g_signal_connect (self->select_info->drag_gesture, "drag-begin",
+                        G_CALLBACK (gtk_label_drag_gesture_begin), self);
+      g_signal_connect (self->select_info->drag_gesture, "drag-update",
+                        G_CALLBACK (gtk_label_drag_gesture_update), self);
+      gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (self->select_info->drag_gesture), TRUE);
+      gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (self->select_info->drag_gesture));
+
+      self->select_info->focus_controller = gtk_event_controller_focus_new ();
+      g_signal_connect (self->select_info->focus_controller, "enter",
+                        G_CALLBACK (focus_change), self);
+      g_signal_connect (self->select_info->focus_controller, "leave",
+                        G_CALLBACK (focus_change), self);
+      gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER 
(self->select_info->focus_controller));
 
       self->select_info->provider = g_object_new (GTK_TYPE_LABEL_CONTENT, NULL);
       GTK_LABEL_CONTENT (self->select_info->provider)->label = self;
@@ -4454,6 +4470,7 @@ gtk_label_clear_select_info (GtkLabel *self)
       gtk_widget_remove_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER 
(self->select_info->drag_gesture));
       gtk_widget_remove_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER 
(self->select_info->click_gesture));
       gtk_widget_remove_controller (GTK_WIDGET (self), self->select_info->motion_controller);
+      gtk_widget_remove_controller (GTK_WIDGET (self), self->select_info->focus_controller);
       GTK_LABEL_CONTENT (self->select_info->provider)->label = NULL;
       g_object_unref (self->select_info->provider);