From: Benjamin Otte <otte.benjamin@googlemail.com>
Date: Wed, 14 Dec 2022 19:06:57 +0000 (+0000)
Subject: Merge branch 'wip/corey/listbase-focus' into 'main'
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1f001a8f6af1c761d8b47e9f5eb0e8936d77d92a;p=gtk4.git

Merge branch 'wip/corey/listbase-focus' into 'main'

listbase: Use set_focus_child properly

Closes #5433 and #5432

See merge request GNOME/gtk!5169
---

1f001a8f6af1c761d8b47e9f5eb0e8936d77d92a
diff --cc gtk/gtklistitemwidget.c
index a90bceda1b,d191150203..9dc96a1982
--- a/gtk/gtklistitemwidget.c
+++ b/gtk/gtklistitemwidget.c
@@@ -486,21 -462,10 +485,8 @@@ gtk_list_item_widget_click_gesture_rele
                                    "(ubb)",
                                    priv->position, modify, extend);
      }
 -
 -  gtk_widget_unset_state_flags (GTK_WIDGET (self), GTK_STATE_FLAG_ACTIVE);
  }
  
- static void
- gtk_list_item_widget_enter_cb (GtkEventControllerFocus *controller,
-                                GtkListItemWidget       *self)
- {
-   GtkWidget *widget = GTK_WIDGET (self);
-   GtkListItemWidgetPrivate *priv = gtk_list_item_widget_get_instance_private (self);
- 
-   gtk_widget_activate_action (widget,
-                               "list.scroll-to-item",
-                               "u",
-                               priv->position);
- }
- 
  static void
  gtk_list_item_widget_hover_cb (GtkEventControllerMotion *controller,
                                 double                    x,
@@@ -540,12 -513,10 +526,8 @@@ gtk_list_item_widget_init (GtkListItemW
                      G_CALLBACK (gtk_list_item_widget_click_gesture_pressed), self);
    g_signal_connect (gesture, "released",
                      G_CALLBACK (gtk_list_item_widget_click_gesture_released), self);
 -  g_signal_connect (gesture, "cancel",
 -                    G_CALLBACK (gtk_list_item_widget_click_gesture_canceled), self);
    gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (gesture));
  
-   controller = gtk_event_controller_focus_new ();
-   g_signal_connect (controller, "enter", G_CALLBACK (gtk_list_item_widget_enter_cb), self);
-   gtk_widget_add_controller (GTK_WIDGET (self), controller);
- 
    controller = gtk_event_controller_motion_new ();
    g_signal_connect (controller, "enter", G_CALLBACK (gtk_list_item_widget_hover_cb), self);
    gtk_widget_add_controller (GTK_WIDGET (self), controller);