Changeset 190

Timestamp:

05/21/06 11:03:54 (2 years ago)

Author:

jordi

Message:

The Gtk+ PageView? now calculates correctly the ammount of space left for the document page. I forgot that the thickness is also applied to the GtkImage? and that the scrollbar spacing must only be applied once for scrollbar.

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 borderWidth = GTK_CONTAINER (widget)->border_width;
-    gint borderHeight = GTK_CONTAINER (widget)->border_width;
+    gint borderWidth = widget->style->xthickness;
+    gint borderHeight = widget->style->ythickness;
     if ( GTK_SHADOW_NONE !=
             gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (widget)) )
@@ -474 +474 @@
     GtkWidget *vScrollBar = GTK_SCROLLED_WINDOW (widget)->vscrollbar;
     *width = vScrollBar->allocation.width +
-             (scrollBarSpacing + PAGE_VIEW_PADDING + borderWidth) * 2;
+             (PAGE_VIEW_PADDING + borderWidth) * 2 + scrollBarSpacing;
 
     GtkWidget *hScrollBar = GTK_SCROLLED_WINDOW (widget)->hscrollbar;
     *height = hScrollBar->allocation.height +
-              (scrollBarSpacing + PAGE_VIEW_PADDING + borderHeight) * 2;
+              (PAGE_VIEW_PADDING + borderHeight) * 2 + scrollBarSpacing;
 }