Changeset 208

Timestamp:

06/10/06 07:24:26 (2 years ago)

Author:

jordi

Message:

When getting the cursor coordinates relative to the document's page, now I take into account that the size of the page can be less than the size of the widget and that could cause problems (see ticket #34.)

Files:

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

trunk/src/gtk/PageView.cxx

@@ -90 +90 @@
     g_assert (NULL != width && "Tried to save the width to a NULL pointer.");
     g_assert (NULL != height && "Tried to save the height to a NULL pointer.");
-  
+
     gint vScrollSize = 0;
     gint hScrollSize = 0;
@@ -119 +119 @@
     gdouble docX1 = getHorizontalScroll () - PAGE_VIEW_PADDING;
     gdouble docX2 = docX1 + hAdjustment->page_size;
-    
+
     gdouble dx = 0.0;
     if ( realX1 < docX1 )
@@ -134 +134 @@
                    hAdjustment->lower,
                    hAdjustment->upper - hAdjustment->page_size));
-    
+
     // Calculate the vertical adjustment.
     GtkAdjustment *vAdjustment = gtk_scrolled_window_get_vadjustment (
@@ -211 +211 @@
 {
     IPageView::setPresenter (pter);
-    
+
     // When resizing.
     g_signal_connect (G_OBJECT (m_PageScroll), "size-allocate",
@@ -245 +245 @@
                    hAdjustment->lower,
                    hAdjustment->upper - hAdjustment->page_size));
-    
+
     GtkAdjustment *vAdjustment = gtk_scrolled_window_get_vadjustment (
             GTK_SCROLLED_WINDOW (m_PageScroll));
@@ -295 +295 @@
         gint width = gdk_pixbuf_get_width (originalPage);
         gint height = gdk_pixbuf_get_height (originalPage);
-       
-        PangoLayout *layout = 
+
+        PangoLayout *layout =
             gtk_widget_create_pango_layout (m_PageImage, text);
 
@@ -318 +318 @@
         pango_layout_set_font_description (layout, fontDescription);
         pango_layout_get_pixel_extents (layout, NULL, &logicalRectangle);
-        
+
         // Once the font are set up, I just need to render 
         // the pixbuf to the pixmap (copying from client-side to 
@@ -346 +346 @@
             g_object_unref (mask);
         }
-        
+
         gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageImage), modifiedPage);
         g_object_unref (modifiedPage);
@@ -366 +366 @@
 {
     g_assert ( NULL != pageX && "Tried to save the page's X to NULL.");
-    g_assert ( NULL != pageY && "Tried to save the page's Y to NULL.");    
-
-    *pageX = widgetX - PAGE_VIEW_PADDING + (gint)getHorizontalScroll ();
-    *pageY = widgetY - PAGE_VIEW_PADDING + (gint)getVerticalScroll ();
+    g_assert ( NULL != pageY && "Tried to save the page's Y to NULL.");
+
+    // Since the page is centered on the GtkImage widget, we need to
+    // get the current widget size and the current image size to know
+    // how many widget space is being used for padding.
+    GdkPixbuf *page = gtk_image_get_pixbuf (GTK_IMAGE (m_PageImage));
+    gint horizontalPadding =
+        (m_PageImage->allocation.width - gdk_pixbuf_get_width (page)) / 2;
+    gint verticalPadding =
+        (m_PageImage->allocation.height - gdk_pixbuf_get_height (page)) / 2;
+
+    *pageX = widgetX - horizontalPadding + (gint)getHorizontalScroll ();
+    *pageY = widgetY - verticalPadding + (gint)getVerticalScroll ();
 }
 
@@ -441 +450 @@
     g_assert ( NULL != data && "The data is NULL.");
     PageView *view = (PageView *)data;
-    
+
     gint event_x;
     gint event_y;
@@ -459 +468 @@
     g_assert (NULL != width && "Tried to save the width to a NULL pointer.");
     g_assert (NULL != height && "Tried to save the height to a NULL pointer.");
-  
+
     gint borderWidth = widget->style->xthickness;
     gint borderHeight = widget->style->ythickness;
@@ -468 +477 @@
         borderHeight += widget->style->ythickness;
     }
-    
+
     gint scrollBarSpacing = 0;
     gtk_widget_style_get (widget, "scrollbar-spacing", &scrollBarSpacing, NULL);
-    
+
     GtkWidget *vScrollBar = GTK_SCROLLED_WINDOW (widget)->vscrollbar;
     *width = vScrollBar->allocation.width +
@@ -489 +498 @@
 {
     g_assert ( NULL != data && "The data parameter is NULL.");
-    
+
     gint vScrollSize = 0;
     gint hScrollSize = 0;
@@ -541 +550 @@
     gboolean horizontal = FALSE;
     PagePter *pter = (PagePter *)data;
-    
+
     GtkAdjustment *adjustment = 
         gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
     gdouble position = gtk_adjustment_get_value (adjustment);
-    
+
     if ( event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK) )
     {
         return FALSE;
     }
-    
+
     switch ( event->keyval )
     {
@@ -558 +567 @@
             horizontal = TRUE;
             break;
-        
+
         case GDK_Right:
         case GDK_KP_Right:
@@ -564 +573 @@
             direction = GTK_SCROLL_STEP_RIGHT;
             break;
-        
+
         case GDK_Up:
         case GDK_KP_Up:
             direction = GTK_SCROLL_STEP_UP;
             break;
-        
+
         case GDK_Down:
         case GDK_KP_Down:
             direction = GTK_SCROLL_STEP_DOWN;
             break;
-        
+
         case GDK_Page_Up:
         case GDK_KP_Page_Up:
@@ -584 +593 @@
             direction = GTK_SCROLL_START;
             break;
-        
+
         case GDK_Page_Down:
         case GDK_KP_Page_Down:
@@ -594 +603 @@
             direction = GTK_SCROLL_END;
             break;
-        
+
         default:
             return FALSE;
     }
-    
+
     g_signal_emit_by_name(G_OBJECT(widget), "scroll-child",
                           direction, horizontal);