From 4d12d8591983491236cd6c9ffa667caf3026805f Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 13 Nov 2013 11:02:47 +0100 Subject: [PATCH] popover: Honor GtkContainer::border-width The border width is now set around the contained widget. --- gtk/gtkpopover.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 2f1157d890..b1380cbdee 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -613,17 +613,20 @@ get_padding_and_border (GtkWidget *widget, { GtkStyleContext *context; GtkStateFlags state; + gint border_width; GtkBorder tmp; context = gtk_widget_get_style_context (widget); state = gtk_widget_get_state_flags (widget); + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); + gtk_style_context_get_padding (context, state, border); gtk_style_context_get_border (context, state, &tmp); - border->top += tmp.top; - border->right += tmp.right; - border->bottom += tmp.bottom; - border->left += tmp.left; + border->top += tmp.top + border_width; + border->right += tmp.right + border_width; + border->bottom += tmp.bottom + border_width; + border->left += tmp.left + border_width; } static void