Merge branch 'wip/otte/for-main' into 'main'

listview: Activatable means activate

See merge request GNOME/gtk!5709
This commit is contained in:
Benjamin Otte 2023-03-24 05:18:08 +00:00
commit a8b211ff15
2 changed files with 2 additions and 2 deletions

View File

@ -254,7 +254,7 @@ gtk_column_view_row_widget_grab_focus (GtkWidget *widget)
for (child = focus_child ? gtk_widget_get_next_sibling (focus_child) : gtk_widget_get_first_child (widget);
child != focus_child;
child = gtk_widget_get_next_sibling (child))
child = child ? gtk_widget_get_next_sibling (child) : gtk_widget_get_first_child (widget))
{
/* When we started iterating at focus_child, we want to iterate over the rest
* of the children, too */

View File

@ -65,7 +65,7 @@ gtk_list_factory_widget_activate_signal (GtkListFactoryWidget *self)
{
GtkListFactoryWidgetPrivate *priv = gtk_list_factory_widget_get_instance_private (self);
if (priv->activatable)
if (!priv->activatable)
return;
gtk_widget_activate_action (GTK_WIDGET (self),