summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2020-11-24 14:19:06 +0100
committerBenjamin Otte <otte@redhat.com>2020-12-24 06:38:45 +0100
commit71e616d17e4d265bba66cbe7dd818195c6934117 (patch)
treea3656d31e8996ed10d61a8934a07e1c6a1a5269a
parentf85d939e5e119625fca9607433b7a985e88a19df (diff)
downloadgtk+-71e616d17e4d265bba66cbe7dd818195c6934117.tar.gz
listview: Use the correct scroll policy
Use the horizontal policy for horizontal decisions, not the vertical one. This broke in 0011ce949c3580e02c4b2c3d83584a6c6e82090c.
-rw-r--r--gtk/gtklistview.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c
index 6d1eb3413b..7a3fe101b3 100644
--- a/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@ -587,11 +587,12 @@ gtk_list_view_size_allocate (GtkWidget *widget,
int min, nat, row_height;
int x, y;
GtkOrientation orientation, opposite_orientation;
- GtkScrollablePolicy scroll_policy;
+ GtkScrollablePolicy scroll_policy, opposite_scroll_policy;
orientation = gtk_list_base_get_orientation (GTK_LIST_BASE (self));
opposite_orientation = OPPOSITE_ORIENTATION (orientation);
scroll_policy = gtk_list_base_get_scroll_policy (GTK_LIST_BASE (self), orientation);
+ opposite_scroll_policy = gtk_list_base_get_scroll_policy (GTK_LIST_BASE (self), opposite_orientation);
/* step 0: exit early if list is empty */
if (gtk_list_item_manager_get_root (self->item_manager) == NULL)
@@ -602,7 +603,7 @@ gtk_list_view_size_allocate (GtkWidget *widget,
-1,
&min, &nat, NULL, NULL);
self->list_width = orientation == GTK_ORIENTATION_VERTICAL ? width : height;
- if (scroll_policy == GTK_SCROLL_MINIMUM)
+ if (opposite_scroll_policy == GTK_SCROLL_MINIMUM)
self->list_width = MAX (min, self->list_width);
else
self->list_width = MAX (nat, self->list_width);