Merge branch 'wip/exalm/activate' into 'master'

listitemwidget: Activate on release instead of press

Closes #3345

See merge request GNOME/gtk!3008
This commit is contained in:
Matthias Clasen 2021-02-01 00:32:05 +00:00
commit de4b8d547b

View File

@ -332,7 +332,7 @@ gtk_list_item_widget_click_gesture_pressed (GtkGestureClick *gesture,
if (!priv->list_item || priv->list_item->activatable)
{
if (n_press == 2 || priv->single_click_activate)
if (n_press == 2 && !priv->single_click_activate)
{
gtk_widget_activate_action (GTK_WIDGET (self),
"list.activate-item",
@ -356,6 +356,16 @@ gtk_list_item_widget_click_gesture_released (GtkGestureClick *gesture,
{
GtkListItemWidgetPrivate *priv = gtk_list_item_widget_get_instance_private (self);
if (priv->single_click_activate)
{
gtk_widget_activate_action (GTK_WIDGET (self),
"list.activate-item",
"u",
priv->position);
return;
}
if (!priv->list_item || priv->list_item->selectable)
{
GdkModifierType state;