GNOME.org
 

[gtk/wip/baedert/for-master] modelbutton: Rework

commit 69da3a2e999e66638a8ebfb9aeab9f2921351418
Author: Timm Bäder <mail baedert org>
Date:   Sat Sep 28 12:37:00 2019 +0200

    modelbutton: Rework
    
    Create all the widgets on demand and use a box layout to arrange them
    instead of manual size allocation.

 gtk/gtkmodelbutton.c | 384 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 231 insertions(+), 153 deletions(-)
---
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 1d5fba92d2..21703a51b0 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -164,14 +164,15 @@ struct _GtkModelButton
   GtkWidget *start_indicator;
   GtkWidget *end_indicator;
   GtkWidget *popover;
-  gboolean active;
-  gboolean centered;
-  gboolean iconic;
   gchar *menu_name;
   GtkButtonRole role;
   GtkSizeGroup *indicators;
   char *accel;
   guint open_timeout;
+
+  guint active : 1;
+  guint centered : 1;
+  guint iconic : 1;
 };
 
 typedef GtkButtonClass GtkModelButtonClass;
@@ -199,37 +200,56 @@ static GParamSpec *properties[LAST_PROPERTY] = { NULL, };
 static void
 update_node_ordering (GtkModelButton *button)
 {
-  GtkStyleContext *start_indicator_context;
-  GtkStyleContext *end_indicator_context;
+  GtkStyleContext *start_indicator_context = NULL;
+  GtkStyleContext *end_indicator_context = NULL;
   GtkWidget *child;
 
-  start_indicator_context = gtk_widget_get_style_context (button->start_indicator);
-  end_indicator_context = gtk_widget_get_style_context (button->end_indicator);
+  if (button->start_indicator)
+    start_indicator_context = gtk_widget_get_style_context (button->start_indicator);
+
+  if (button->end_indicator)
+    end_indicator_context = gtk_widget_get_style_context (button->end_indicator);
 
   if (gtk_widget_get_direction (GTK_WIDGET (button)) == GTK_TEXT_DIR_LTR)
     {
-      gtk_style_context_add_class (start_indicator_context, GTK_STYLE_CLASS_LEFT);
-      gtk_style_context_remove_class (start_indicator_context, GTK_STYLE_CLASS_RIGHT);
-      gtk_style_context_add_class (end_indicator_context, GTK_STYLE_CLASS_RIGHT);
-      gtk_style_context_remove_class (end_indicator_context, GTK_STYLE_CLASS_LEFT);
+      if (start_indicator_context)
+        {
+          gtk_style_context_add_class (start_indicator_context, GTK_STYLE_CLASS_LEFT);
+          gtk_style_context_remove_class (start_indicator_context, GTK_STYLE_CLASS_RIGHT);
+        }
+
+      if (end_indicator_context)
+        {
+          gtk_style_context_add_class (end_indicator_context, GTK_STYLE_CLASS_RIGHT);
+          gtk_style_context_remove_class (end_indicator_context, GTK_STYLE_CLASS_LEFT);
+        }
 
       child = gtk_widget_get_first_child (GTK_WIDGET (button));
-      if (child != button->start_box)
+     if (button->start_indicator && child != button->start_box)
         gtk_widget_insert_before (button->start_box, GTK_WIDGET (button), child);
+
       child = gtk_widget_get_last_child (GTK_WIDGET (button));
-      if (child != button->end_indicator)
+      if (button->end_indicator && child != button->end_indicator)
         gtk_widget_insert_after (button->end_indicator, GTK_WIDGET (button), child);
     }
   else
     {
-      gtk_style_context_add_class (start_indicator_context, GTK_STYLE_CLASS_RIGHT);
-      gtk_style_context_remove_class (start_indicator_context, GTK_STYLE_CLASS_LEFT);
-      gtk_style_context_add_class (end_indicator_context, GTK_STYLE_CLASS_LEFT);
-      gtk_style_context_remove_class (end_indicator_context, GTK_STYLE_CLASS_RIGHT);
+      if (start_indicator_context)
+        {
+          gtk_style_context_add_class (start_indicator_context, GTK_STYLE_CLASS_RIGHT);
+          gtk_style_context_remove_class (start_indicator_context, GTK_STYLE_CLASS_LEFT);
+        }
+
+      if (end_indicator_context)
+        {
+          gtk_style_context_add_class (end_indicator_context, GTK_STYLE_CLASS_LEFT);
+          gtk_style_context_remove_class (end_indicator_context, GTK_STYLE_CLASS_RIGHT);
+        }
 
       child = gtk_widget_get_first_child (GTK_WIDGET (button));
-      if (child != button->end_indicator)
+      if (button->end_indicator && child != button->end_indicator)
         gtk_widget_insert_before (button->end_indicator, GTK_WIDGET (button), child);
+
       child = gtk_widget_get_last_child (GTK_WIDGET (button));
       if (child != button->start_box)
         gtk_widget_insert_after (button->start_box, GTK_WIDGET (button), child);
@@ -237,76 +257,95 @@ update_node_ordering (GtkModelButton *button)
 }
 
 static void
-gtk_model_button_update_state (GtkModelButton *button)
+update_end_indicator (GtkModelButton *self)
 {
-  GtkStateFlags state;
-  GtkStateFlags indicator_state;
-  GtkCssImageBuiltinType start_type;
-  GtkCssImageBuiltinType end_type;
-  gboolean centered;
-
-  state = gtk_widget_get_state_flags (GTK_WIDGET (button));
-  indicator_state = state;
-  start_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-  end_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-  centered = FALSE;
-
-  switch (button->role)
-    {
-    case GTK_BUTTON_ROLE_CHECK:
-      start_type = GTK_CSS_IMAGE_BUILTIN_CHECK;
-      end_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-      if (button->active)
-        indicator_state |= GTK_STATE_FLAG_CHECKED;
-      else
-        indicator_state &= ~GTK_STATE_FLAG_CHECKED;
-      break;
+  const gboolean is_ltr = gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_LTR;
+  GtkStyleContext *context;
 
-    case GTK_BUTTON_ROLE_RADIO:
-      start_type = GTK_CSS_IMAGE_BUILTIN_OPTION;
-      end_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-      if (button->active)
-        indicator_state |= GTK_STATE_FLAG_CHECKED;
-      else
-        indicator_state &= ~GTK_STATE_FLAG_CHECKED;
-      break;
+  if (!self->end_indicator)
+    return;
 
-    case GTK_BUTTON_ROLE_TITLE:
-      centered = TRUE;
-      start_type = GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT;
-      end_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-      break;
+  if (self->role == GTK_BUTTON_ROLE_NORMAL &&
+      (self->menu_name != NULL || self->popover != NULL))
+    {
+      gtk_icon_set_image (GTK_ICON (self->end_indicator), GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT);
+    }
 
-    case GTK_BUTTON_ROLE_NORMAL:
-      start_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-      if (button->menu_name != NULL ||
-          button->popover != NULL)
-        end_type = GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT;
-      else
-        end_type = GTK_CSS_IMAGE_BUILTIN_NONE;
-      centered = button->iconic;
-      break;
+  context = gtk_widget_get_style_context (self->end_indicator);
 
-    default:
-      g_assert_not_reached ();
+  if (is_ltr)
+    {
+      gtk_style_context_remove_class (context, GTK_STYLE_CLASS_LEFT);
+      gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);
+    }
+  else
+    {
+      gtk_style_context_remove_class (context, GTK_STYLE_CLASS_RIGHT);
+      gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);
     }
+}
+
+static GtkStateFlags
+get_start_indicator_state (GtkModelButton *self)
+{
+  GtkStateFlags state = gtk_widget_get_state_flags (GTK_WIDGET (self));
 
-  if (button->centered != centered)
+  if (self->role == GTK_BUTTON_ROLE_CHECK ||
+      self->role == GTK_BUTTON_ROLE_RADIO)
     {
-      button->centered = centered;
-      gtk_widget_set_halign (button->box, button->centered ? GTK_ALIGN_CENTER : GTK_ALIGN_FILL);
-      gtk_widget_queue_resize (GTK_WIDGET (button));
+      if (self->active)
+        state |= GTK_STATE_FLAG_CHECKED;
+      else
+        state &= ~GTK_STATE_FLAG_CHECKED;
     }
 
-  gtk_icon_set_image (GTK_ICON (button->start_indicator), start_type);
-  gtk_icon_set_image (GTK_ICON (button->end_indicator), end_type);
+  return state;
+}
+
+static void
+update_start_indicator (GtkModelButton *self)
+{
+  const gboolean is_ltr = gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_LTR;
+  GtkStyleContext *context;
+
+  if (!self->start_indicator)
+    return;
+
+  if (self->role == GTK_BUTTON_ROLE_CHECK)
+      gtk_icon_set_image (GTK_ICON (self->start_indicator), GTK_CSS_IMAGE_BUILTIN_CHECK);
+  else if (self->role == GTK_BUTTON_ROLE_RADIO)
+      gtk_icon_set_image (GTK_ICON (self->start_indicator), GTK_CSS_IMAGE_BUILTIN_OPTION);
+  else if (self->role == GTK_BUTTON_ROLE_TITLE)
+    gtk_icon_set_image (GTK_ICON (self->start_indicator), GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT);
+  else
+    gtk_icon_set_image (GTK_ICON (self->start_indicator), GTK_CSS_IMAGE_BUILTIN_NONE);
+
+  gtk_widget_set_state_flags (self->start_indicator, get_start_indicator_state (self), TRUE);
 
-  if (button->iconic)
-    gtk_widget_set_state_flags (GTK_WIDGET (button), indicator_state, TRUE);
+  context = gtk_widget_get_style_context (self->start_indicator);
+
+  if (is_ltr)
+    {
+      gtk_style_context_remove_class (context, GTK_STYLE_CLASS_RIGHT);
+      gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);
+    }
   else
-    gtk_widget_set_state_flags (GTK_WIDGET (button), state, TRUE);
+    {
+      gtk_style_context_remove_class (context, GTK_STYLE_CLASS_LEFT);
+      gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);
+    }
+}
+
+static void
+gtk_model_button_update_state (GtkModelButton *self)
+{
+  update_start_indicator (self);
+  update_end_indicator (self);
 
-  gtk_widget_set_state_flags (button->start_indicator, indicator_state, TRUE);
+  if (self->iconic)
+    gtk_widget_set_state_flags (GTK_WIDGET (self),
+                                get_start_indicator_state (self),
+                                TRUE);
 }
 
 static void
@@ -331,15 +370,15 @@ gtk_model_button_direction_changed (GtkWidget        *widget,
 }
 
 static void
-update_node_name (GtkModelButton *button)
+update_node_name (GtkModelButton *self)
 {
   AtkObject *accessible;
   AtkRole a11y_role;
   const gchar *start_name;
   const gchar *end_name;
 
-  accessible = gtk_widget_get_accessible (GTK_WIDGET (button));
-  switch (button->role)
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (self));
+  switch (self->role)
     {
     case GTK_BUTTON_ROLE_TITLE:
       a11y_role = ATK_ROLE_PUSH_BUTTON;
@@ -349,7 +388,7 @@ update_node_name (GtkModelButton *button)
     case GTK_BUTTON_ROLE_NORMAL:
       a11y_role = ATK_ROLE_PUSH_BUTTON;
       start_name = I_("none");
-      if (button->menu_name || button->popover)
+      if (self->menu_name || self->popover)
         end_name = I_("arrow");
       else
         end_name = I_("none");
@@ -371,7 +410,7 @@ update_node_name (GtkModelButton *button)
       g_assert_not_reached ();
     }
 
-  if (button->iconic)
+  if (self->iconic)
     {
       start_name = I_("none");
       end_name = I_("none");
@@ -379,55 +418,102 @@ update_node_name (GtkModelButton *button)
 
   atk_object_set_role (accessible, a11y_role);
 
-  gtk_icon_set_css_name (GTK_ICON (button->start_indicator), start_name);
-  gtk_icon_set_css_name (GTK_ICON (button->end_indicator), end_name);
-  gtk_widget_set_visible (button->start_indicator, start_name != I_("none"));
-  gtk_widget_set_visible (button->end_indicator, end_name != I_("none"));
+  if (start_name != I_("none") && !self->start_indicator)
+    {
+      self->start_indicator = gtk_icon_new (start_name);
+      gtk_widget_set_halign (self->start_indicator, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (self->start_indicator, GTK_ALIGN_CENTER);
+      update_start_indicator (self);
+
+      gtk_container_add (GTK_CONTAINER (self->start_box), self->start_indicator);
+    }
+  else if (self->start_indicator)
+    {
+      gtk_container_remove (GTK_CONTAINER (self->start_box), self->start_indicator);
+      self->start_indicator = NULL;
+    }
+
+  if (end_name != I_("none") && !self->end_indicator)
+    {
+      self->end_indicator = gtk_icon_new (end_name);
+      gtk_widget_set_halign (self->end_indicator, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (self->end_indicator, GTK_ALIGN_CENTER);
+      gtk_widget_set_parent (self->end_indicator, GTK_WIDGET (self));
+      update_end_indicator (self);
+    }
+  else
+    {
+      g_clear_pointer (&self->end_indicator, gtk_widget_unparent);
+    }
 }
 
 static void
-gtk_model_button_set_role (GtkModelButton *button,
+gtk_model_button_set_role (GtkModelButton *self,
                            GtkButtonRole   role)
 {
-  if (role == button->role)
+  if (role == self->role)
     return;
 
-  button->role = role;
+  self->role = role;
 
   if (role == GTK_BUTTON_ROLE_TITLE)
-    gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (button)), "title");
+    {
+      gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "title");
+      gtk_widget_set_halign (self->label, GTK_ALIGN_CENTER);
+    }
   else
-    gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (button)), "title");
+    {
+      gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (self)), "title");
+      gtk_widget_set_halign (self->label, GTK_ALIGN_START);
+    }
 
-  update_node_name (button);
-  gtk_model_button_update_state (button);
+  update_node_name (self);
+  gtk_model_button_update_state (self);
 
-  gtk_widget_queue_draw (GTK_WIDGET (button));
-  g_object_notify_by_pspec (G_OBJECT (button), properties[PROP_ROLE]);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ROLE]);
 }
 
 static void
-update_visibility (GtkModelButton *button)
+update_visibility (GtkModelButton *self)
 {
   gboolean has_icon;
   gboolean has_text;
 
-  has_icon = gtk_image_get_storage_type (GTK_IMAGE (button->image)) != GTK_IMAGE_EMPTY;
-  has_text = gtk_label_get_text (GTK_LABEL (button->label))[0] != '\0';
+  has_icon = self->image && gtk_image_get_storage_type (GTK_IMAGE (self->image)) != GTK_IMAGE_EMPTY;
+  has_text = gtk_label_get_text (GTK_LABEL (self->label))[0] != '\0';
+
+  gtk_widget_set_visible (self->label, has_text && (!self->iconic || !has_icon));
+  gtk_widget_set_hexpand (self->label,
+                          gtk_widget_get_visible (self->label) && !has_icon);
 
-  gtk_widget_set_visible (button->image, has_icon && (button->iconic || !has_text));
-  gtk_widget_set_visible (button->label, has_text && (!button->iconic || !has_icon));
-  gtk_widget_set_hexpand (button->image, has_icon && !has_text);
-  gtk_widget_set_hexpand (button->box, FALSE);
+  if (self->image)
+    {
+      gtk_widget_set_visible (self->image, has_icon && (self->iconic || !has_text));
+      gtk_widget_set_hexpand (self->image,
+                              has_icon && (!has_text || !gtk_widget_get_visible (self->label)));
+    }
 }
 
 static void
-gtk_model_button_set_icon (GtkModelButton *button,
+gtk_model_button_set_icon (GtkModelButton *self,
                            GIcon          *icon)
 {
-  gtk_image_set_from_gicon (GTK_IMAGE (button->image), icon);
-  update_visibility (button);
-  g_object_notify_by_pspec (G_OBJECT (button), properties[PROP_ICON]);
+  if (!self->image && icon)
+    {
+      self->image = gtk_image_new_from_gicon (icon);
+      gtk_widget_insert_before (self->image, GTK_WIDGET (self), self->label);
+    }
+  else if (self->image && !icon)
+    {
+      g_clear_pointer (&self->image, gtk_widget_unparent);
+    }
+  else if (icon)
+    {
+      gtk_image_set_from_gicon (GTK_IMAGE (self->image), icon);
+    }
+
+  update_visibility (self);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ICON]);
 }
 
 static void
@@ -482,46 +568,49 @@ gtk_model_button_set_menu_name (GtkModelButton *button,
 }
 
 static void
-gtk_model_button_set_iconic (GtkModelButton *button,
+gtk_model_button_set_iconic (GtkModelButton *self,
                              gboolean        iconic)
 {
   GtkCssNode *widget_node;
   GtkStyleContext *context;
 
   iconic = !!iconic;
-  if (button->iconic == iconic)
+  if (self->iconic == iconic)
     return;
 
-  button->iconic = iconic;
+  self->iconic = iconic;
 
-  widget_node = gtk_widget_get_css_node (GTK_WIDGET (button));
-  context = gtk_widget_get_style_context (GTK_WIDGET (button));
+  widget_node = gtk_widget_get_css_node (GTK_WIDGET (self));
+  context = gtk_widget_get_style_context (GTK_WIDGET (self));
   if (iconic)
     {
+      gtk_widget_hide (self->start_box);
       gtk_css_node_set_name (widget_node, I_("button"));
       gtk_style_context_add_class (context, "model");
       gtk_style_context_add_class (context, "image-button");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL);
+      gtk_button_set_relief (GTK_BUTTON (self), GTK_RELIEF_NORMAL);
     }
   else
     {
+      gtk_widget_show (self->start_box);
       gtk_css_node_set_name (widget_node, I_("modelbutton"));
       gtk_style_context_remove_class (context, "model");
       gtk_style_context_remove_class (context, "image-button");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_relief (GTK_BUTTON (self), GTK_RELIEF_NONE);
     }
 
-  button->centered = iconic;
+  self->centered = iconic;
 
-  gtk_widget_set_visible (button->start_box, !iconic);
-  gtk_widget_set_visible (button->end_indicator, !iconic);
-
-  gtk_widget_set_halign (button->box, button->centered ? GTK_ALIGN_CENTER : GTK_ALIGN_FILL);
+  if (!iconic)
+    {
+      gtk_container_remove (GTK_CONTAINER (self->start_box), self->start_indicator);
+      self->start_indicator = NULL;
+      g_clear_pointer (&self->end_indicator, gtk_widget_unparent);
+    }
 
-  update_node_name (button);
-  update_visibility (button);
-  gtk_widget_queue_resize (GTK_WIDGET (button));
-  g_object_notify_by_pspec (G_OBJECT (button), properties[PROP_ICONIC]);
+  update_node_name (self);
+  update_visibility (self);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ICONIC]);
 }
 
 static void
@@ -773,8 +862,11 @@ gtk_model_button_finalize (GObject *object)
 {
   GtkModelButton *button = GTK_MODEL_BUTTON (object);
 
-  gtk_widget_unparent (button->start_box);
-  gtk_widget_unparent (button->end_indicator);
+  g_clear_pointer (&button->image, gtk_widget_unparent);
+  g_clear_pointer (&button->label, gtk_widget_unparent);
+  g_clear_pointer (&button->start_box, gtk_widget_unparent);
+  g_clear_pointer (&button->accel_label, gtk_widget_unparent);
+  g_clear_pointer (&button->end_indicator, gtk_widget_unparent);
   g_free (button->accel);
   g_clear_pointer (&button->popover, gtk_widget_unparent);
 
@@ -1158,45 +1250,31 @@ focus_in_cb (GtkEventController *controller,
 }
 
 static void
-gtk_model_button_init (GtkModelButton *button)
+gtk_model_button_init (GtkModelButton *self)
 {
   GtkEventController *controller;
 
-  button->role = GTK_BUTTON_ROLE_NORMAL;
-  gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-  button->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_widget_set_halign (button->box, GTK_ALIGN_FILL);
-  button->image = gtk_image_new ();
-  gtk_widget_hide (button->image);
-  button->label = gtk_label_new ("");
-  gtk_widget_hide (button->label);
-
-  gtk_container_add (GTK_CONTAINER (button->box), button->image);
-  gtk_container_add (GTK_CONTAINER (button->box), button->label);
-  gtk_container_add (GTK_CONTAINER (button), button->box);
-
-  button->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  button->start_indicator = gtk_icon_new ("none");
-  button->end_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  button->end_indicator = gtk_icon_new ("none");
-  gtk_widget_set_halign (button->end_indicator, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (button->end_indicator, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (button->start_box), button->start_indicator);
-  gtk_widget_set_parent (button->start_box, GTK_WIDGET (button));
-  gtk_widget_set_parent (button->end_indicator, GTK_WIDGET (button));
-  gtk_widget_hide (button->start_indicator);
-  gtk_widget_hide (button->end_indicator);
-  update_node_ordering (button);
+  self->role = GTK_BUTTON_ROLE_NORMAL;
+  gtk_button_set_relief (GTK_BUTTON (self), GTK_RELIEF_NONE);
+  self->label = gtk_label_new ("");
+  gtk_widget_set_halign (self->label, GTK_ALIGN_START);
+  gtk_widget_hide (self->label);
+
+  gtk_widget_set_parent (self->label, GTK_WIDGET (self));
+
+  self->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_insert_after (self->start_box, GTK_WIDGET (self), NULL);
+  update_node_ordering (self);
 
   controller = gtk_event_controller_motion_new ();
-  g_signal_connect (controller, "enter", G_CALLBACK (enter_cb), button);
-  g_signal_connect (controller, "motion", G_CALLBACK (motion_cb), button);
-  g_signal_connect (controller, "leave", G_CALLBACK (leave_cb), button);
-  gtk_widget_add_controller (GTK_WIDGET (button), controller);
+  g_signal_connect (controller, "enter", G_CALLBACK (enter_cb), self);
+  g_signal_connect (controller, "motion", G_CALLBACK (motion_cb), self);
+  g_signal_connect (controller, "leave", G_CALLBACK (leave_cb), self);
+  gtk_widget_add_controller (GTK_WIDGET (self), controller);
 
   controller = gtk_event_controller_key_new ();
   g_signal_connect (controller, "focus-in", G_CALLBACK (focus_in_cb), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (button), controller);
+  gtk_widget_add_controller (GTK_WIDGET (self), controller);
 }
 
 /**
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]