diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2017-03-10 17:09:13 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2017-03-10 17:09:13 +0100 |
| commit | 3e303131022915e8df22b2edb590ee2515393cbd (patch) | |
| tree | 80862883d411285b812110fb0cade1a26ce7c774 | |
| parent | 71ad9be5fe87a07b63d1ca3df96a6620f516aef3 (diff) | |
| download | nautilus-3e303131022915e8df22b2edb590ee2515393cbd.tar.gz | |
container-max-width: Fix padding calculation
We were taking into account the child's padding for min and max size,
instead of the self widget.
| -rw-r--r-- | src/nautilus-container-max-width.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nautilus-container-max-width.c b/src/nautilus-container-max-width.c index 29dd34ad7..259b021b5 100644 --- a/src/nautilus-container-max-width.c +++ b/src/nautilus-container-max-width.c @@ -111,9 +111,9 @@ get_preferred_width (GtkWidget *widget, *natural_size = self->max_width == -1 ? *natural_size : MAX (*minimum_size, MIN (self->max_width, *natural_size)); - style_context = gtk_widget_get_style_context (child); + style_context = gtk_widget_get_style_context (widget); gtk_style_context_get_padding (style_context, - gtk_widget_get_state_flags (child), + gtk_widget_get_state_flags (widget), &padding); *minimum_size += padding.left + padding.right; *natural_size += padding.left + padding.right; @@ -139,9 +139,9 @@ get_preferred_height (GtkWidget *widget, gtk_widget_get_preferred_height_for_width (child, natural_width, minimum_size, natural_size); - style_context = gtk_widget_get_style_context (child); + style_context = gtk_widget_get_style_context (widget); gtk_style_context_get_padding (style_context, - gtk_widget_get_state_flags (child), + gtk_widget_get_state_flags (widget), &padding); *minimum_size += padding.top + padding.bottom; *natural_size += padding.top + padding.bottom; |