[gthumb] removed direct access to xthickness



commit 6201e6bb32a7c110883c53b6697f59e676480c72
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Oct 16 13:21:30 2011 +0200

    removed direct access to xthickness

 gthumb/gth-file-list.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gthumb/gth-file-list.c b/gthumb/gth-file-list.c
index 169d085..2cbc3d9 100644
--- a/gthumb/gth-file-list.c
+++ b/gthumb/gth-file-list.c
@@ -297,11 +297,11 @@ gth_file_list_get_preferred_width (GtkWidget *widget,
                 		   int       *natural_width)
 {
 	GthFileList *file_list = GTH_FILE_LIST (widget);
-	int          xthickness;
+	GtkBorder    padding;
 	GtkWidget   *vscrollbar;
 
-	xthickness = gtk_widget_get_style (file_list->priv->scrolled_window)->xthickness;
-	*minimum_width = file_list->priv->thumb_size + (THUMBNAIL_BORDER * 2) + xthickness * 2;
+	gtk_style_context_get_padding  (gtk_widget_get_style_context (file_list->priv->scrolled_window), GTK_STATE_FLAG_NORMAL, &padding);
+	*minimum_width = file_list->priv->thumb_size + (THUMBNAIL_BORDER * 2) + padding.left + padding.right;
 
 	vscrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window));
 	if (gtk_widget_get_visible (vscrollbar)) {
@@ -326,10 +326,10 @@ gth_file_list_get_preferred_height (GtkWidget *widget,
                 		    int       *natural_height)
 {
 	GthFileList *file_list = GTH_FILE_LIST (widget);
-	int          ythickness;
+	GtkBorder    padding;
 
-	ythickness = gtk_widget_get_style (file_list->priv->scrolled_window)->ythickness;
-	*minimum_height = file_list->priv->thumb_size + (THUMBNAIL_BORDER * 2) + ythickness * 2;
+	gtk_style_context_get_padding  (gtk_widget_get_style_context (file_list->priv->scrolled_window), GTK_STATE_FLAG_NORMAL, &padding);
+	*minimum_height = file_list->priv->thumb_size + (THUMBNAIL_BORDER * 2) + padding.top + padding.bottom;
 	*natural_height = *minimum_height;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]