Changeset 189

Timestamp:

05/21/06 08:00:38 (2 years ago)

Author:

jordi

Message:

Added the container width when calculating the scroll bar's size in order to get the child's size to use when zoom to width and zoom to fit.

Files:

• trunk/src/gtk/PageView.cxx (modified) (2 diffs)

trunk/src/gtk/PageView.cxx

@@ -460 +460 @@
     g_assert (NULL != height && "Tried to save the height to a NULL pointer.");
   
-    gint shadowWidth = 0;
-    gint shadowHeight = 0;
+    gint borderWidth = GTK_CONTAINER (widget)->border_width;
+    gint borderHeight = GTK_CONTAINER (widget)->border_width;
     if ( GTK_SHADOW_NONE !=
             gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (widget)) )
     {
-        shadowWidth = widget->style->xthickness;
-        shadowHeight = widget->style->ythickness;
+        borderWidth += widget->style->xthickness;
+        borderHeight += widget->style->ythickness;
     }
     
@@ -474 +474 @@
     GtkWidget *vScrollBar = GTK_SCROLLED_WINDOW (widget)->vscrollbar;
     *width = vScrollBar->allocation.width +
-             (scrollBarSpacing + PAGE_VIEW_PADDING + shadowWidth) * 2;
+             (scrollBarSpacing + PAGE_VIEW_PADDING + borderWidth) * 2;
 
     GtkWidget *hScrollBar = GTK_SCROLLED_WINDOW (widget)->hscrollbar;
     *height = hScrollBar->allocation.height +
-              (scrollBarSpacing + PAGE_VIEW_PADDING + shadowHeight) * 2;
+              (scrollBarSpacing + PAGE_VIEW_PADDING + borderHeight) * 2;
 }