Changeset 146

Timestamp:

05/05/06 08:46:28 (2 years ago)

Author:

jordi

Message:

Now is the PagePter? how is doing the page scroll. This way I can add other actions when the mouse moves (i.e., hyperlinks) or when the mouse button is pressed (i.e., selecting instead of dragging.)

Files:

• trunk/src/IPageView.h (modified) (2 diffs)
• trunk/src/PagePter.cxx (modified) (5 diffs)
• trunk/src/PagePter.h (modified) (3 diffs)
• trunk/src/gtk/PageView.cxx (modified) (10 diffs)
• trunk/src/gtk/PageView.h (modified) (1 diff)
• trunk/tests/DumbPageView.cxx (modified) (2 diffs)
• trunk/tests/DumbPageView.h (modified) (1 diff)
• trunk/tests/PagePterTest.cxx (modified) (1 diff)
• trunk/tests/PagePterTest.h (modified) (2 diffs)

trunk/src/IPageView.h

@@ -44 +44 @@
-            PagePter *getPresenter (void) { return m_Pter; }
-
+            /// @brief Gets the horizontal scroll position.
+            ///
+            /// @return The position of the horizontal scroll bar.
+            virtual gdouble getHorizontalScroll (void) = 0;
+
-            ///
-            /// @brief Gets the size of the document's view.
@@ -58 +63 @@
-            /// @param height The location to save the page view's height.
-            virtual void getSize (gint *width, gint *height) = 0;
+
+            /// @brief Gets the vertical scroll position.
+            ///
+            /// @return The position of the vertical scroll bar.
+            virtual gdouble getVerticalScroll (void) = 0;
+            
+            ///
+            /// @brief Sets the page scroll.
+            ///
+            /// The view should scroll the page when the presenter calls
+            /// this, because it's dragging the page with the mouse.
+            ///
+            /// @param scrollX The drag X start position of the scroll bar.
+            /// @param scrollY The drag Y start position of the scroll bar.
+            /// @param dx The difference in the x-axis between the drag
+            ///           start position and the current mouse position.
+            /// @param dy The difference in the y-axis between the drag
+            ///           start position and the current mouse position.
+            ///
+            virtual void scrollPage (gdouble scrollX, gdouble scrollY,
+                                     gint dx, gint dy) = 0;
-
-            ///

trunk/src/PagePter.cxx

@@ -20 +20 @@
-using namespace ePDFView;
-
+// Types
-typedef struct
-{
@@ -27 +28 @@
-PageNotAvailableData;
-
+struct _DragInfo
+{
+    gint x;
+    gint y;
+    gdouble scrollX;
+    gdouble scrollY;
+};
+
-// Global variables.
-static gboolean g_WaitingForPage = FALSE;
@@ -37 +46 @@
-    m_Document = document;
-    m_Document->attach (this);
+    m_DragInfo = NULL;
-    m_NextPageScroll = PAGE_SCROLL_START;
-    m_PageView = NULL;
@@ -46 +56 @@
-PagePter::~PagePter ()
-{
+    delete m_DragInfo;
-}
-
@@ -65 +76 @@
-
-    return (*m_PageView);
+}
+
+void
+PagePter::mouseButtonPressed (gint button, gint x, gint y)
+{
+    if ( 1 == button )
+    {
+        m_DragInfo = new DragInfo;
+        m_DragInfo->x = x;
+        m_DragInfo->y = y;
+        m_DragInfo->scrollX = getView ().getHorizontalScroll ();
+        m_DragInfo->scrollY = getView ().getVerticalScroll ();
+    }
+}
+
+void
+PagePter::mouseButtonReleased (gint button)
+{
+    if ( 1 == button )
+    {
+        delete m_DragInfo;
+        m_DragInfo = NULL;
+    }
+}
+
+void
+PagePter::mouseMoved (gint x, gint y)
+{
+    if ( NULL != m_DragInfo )
+    {
+        getView ().scrollPage (m_DragInfo->scrollX, m_DragInfo->scrollY,
+                               x - m_DragInfo->x, y - m_DragInfo->y);
+    }
-}
-

trunk/src/PagePter.h

@@ -19 +19 @@
-#define __PAGE_PTER_H__
-
+// Forward declarations.
+typedef struct _DragInfo DragInfo;
+
-namespace ePDFView
-{
@@ -29 +32 @@
-            void getSize (gint *width, gint *height);
-            IPageView &getView (void);
+            void mouseButtonPressed (gint mouseButton, gint x, gint y);
+            void mouseButtonReleased (gint mouseButton);
+            void mouseMoved (gint x, gint y);
-            void notifyLoad (void);
-            void notifyPageChanged (gint pageNum);
@@ -41 +47 @@
-        protected:
-            IDocument *m_Document;
+            DragInfo *m_DragInfo;
-            PageScroll m_NextPageScroll;
-            IPageView *m_PageView;

trunk/src/gtk/PageView.cxx

@@ -27 +27 @@
-static gint PAGE_VIEW_PADDING = 12;
-
-// Types.
-typedef struct
-{
-    gboolean inDrag;
-    gdouble startX;
-    gdouble startY;
-    gdouble hAdjustment;
-    gdouble vAdjustment;
-    GtkScrolledWindow *pageScroll;
-} DragInfo;
-
-
-// Forwards declarations.
-static gboolean page_view_button_press_cb (GtkWidget *, GdkEventButton *,
@@ -44 +32 @@
-static gboolean page_view_button_release_cb (GtkWidget *, GdkEventButton *, 
-                                             gpointer);
-
+
+
-static void page_view_get_scrollbars_size (GtkWidget *widget, 
-                                           gint *width, gint *height);
@@ -84 +73 @@
-}
-
+gdouble
+PageView::getHorizontalScroll ()
+{
+    GtkAdjustment *hAdjustment = gtk_scrolled_window_get_hadjustment (
+            GTK_SCROLLED_WINDOW (m_PageScroll));
+    return gtk_adjustment_get_value (hAdjustment);
+}
+
-void 
-PageView::getSize (gint *width, gint *height)
@@ -97 +94 @@
-}
-
+gdouble
+PageView::getVerticalScroll ()
+{
+    GtkAdjustment *vAdjustment = gtk_scrolled_window_get_vadjustment (
+            GTK_SCROLLED_WINDOW (m_PageScroll));
+    return gtk_adjustment_get_value (vAdjustment);
+}
+
-void
-PageView::setPresenter (PagePter *pter)
@@ -109 +114 @@
-                      G_CALLBACK (page_view_scrolled_cb), pter);
-
-
-
-
+
+
+
+
-                                       GDK_BUTTON_RELEASE_MASK);
-    g_signal_connect (G_OBJECT (m_EventBox), "button-press-event",
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -151 +182 @@
-}
-
+void
+PageView::getPagePosition (gint widgetX, gint widgetY, gint *pageX, gint *pageY)
+{
+    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 ();
+}
+
-///
-/// @brief Creates a new GdkPixbuf from a given DocumentPage.
@@ -181 +222 @@
-{
-    g_assert ( NULL != data && "The data is NULL.");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -223 +244 @@
-    g_assert ( NULL != data && "The data is NULL.");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -246 +254 @@
-///
-gboolean
-
+
+
-{
-    g_assert ( NULL != data && "The data is NULL.");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -347 +324 @@
-/// @brief The page view has been scrolled.
-///
-d
+
-///
-static gboolean

trunk/src/gtk/PageView.h

@@ -26 +26 @@
-            PageView (void);
-            ~PageView (void);
-
+
+
-            GtkWidget *getTopWidget (void);
+            void getPagePosition (gint widgetX, gint widgetY,
+                                  gint *pageX, gint *pageY);
-            void getSize (gint *width, gint *height);
+            gdouble getVerticalScroll (void);
+            void scrollPage (gdouble scrollX, gdouble scrollY,
+                             gint dx, gint dy);
-            void setPresenter (PagePter *pter);
-            void showPage (DocumentPage *page, PageScroll scroll);

trunk/tests/DumbPageView.cxx

@@ -24 +24 @@
-    IPageView ()
-{
+    m_HorizontalScroll = 0.0;
+    m_VerticalScroll = 0.0;
-}
-
-DumbPageView::~DumbPageView ()
-{
+}
+
+gdouble
+DumbPageView::getHorizontalScroll ()
+{
+    return m_HorizontalScroll;
-}
-
@@ -37 +45 @@
-}
-
+gdouble
+DumbPageView::getVerticalScroll ()
+{
+    return m_VerticalScroll;
+}
+
+void
+DumbPageView::scrollPage (gdouble scrollX, gdouble scrollY, gint dx, gint dy)
+{
+    m_HorizontalScroll = (gdouble)dx;
+    m_VerticalScroll = (gdouble)dy;
+}
+
-void
-DumbPageView::showPage (DocumentPage *page, PageScroll scroll)

trunk/tests/DumbPageView.h

@@ -27 +27 @@
-            ~DumbPageView (void);
-
+            gdouble getHorizontalScroll (void);
-            void getSize (gint *width, gint *height);
+            gdouble getVerticalScroll (void);
+            void scrollPage (gdouble scrollX, gdouble scrollY,
+                             gint dx, gint dy);
-            void showPage (DocumentPage *page, PageScroll scroll);
+
+            
+        private:
+            gdouble m_HorizontalScroll;
+            gdouble m_VerticalScroll;
-    };
-}

trunk/tests/PagePterTest.cxx

@@ -152 +152 @@
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.4, m_Document->getZoom (), 0.0001);
-}
+
+///
+/// @brief Test dragging the page with the left mouse button.
+///
+void
+PagePterTest::pageDrag ()
+{
+    // Moving the mouse without pressing the first mouse button, doesn't
+    // change the current scrolling.
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+    m_PagePter->mouseMoved (10, 10);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+    m_PagePter->mouseMoved (15, 20);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+
+    // Now press the first mouse button and move a little the pointer.
+    // The presenter should tell the view the difference between the position
+    // where the drag started and the current position when the mouse moves.
+    m_PagePter->mouseButtonPressed (1, 15, 20);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+    m_PagePter->mouseMoved (20, 21);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (5.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+    m_PagePter->mouseMoved (16, 26);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (6.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+    m_PagePter->mouseMoved (10, 13);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (-5.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (-7.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+
+    // Releasing the first mouse button stops the drag and doesn't change
+    // the scroll.
+    m_PagePter->mouseButtonReleased (1);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (-5.0, m_PageView->getHorizontalScroll (), 
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (-7.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+    m_PagePter->mouseMoved (20, 21);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (-5.0, m_PageView->getHorizontalScroll (),
+                                  0.0001);
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (-7.0, m_PageView->getVerticalScroll (),
+                                  0.0001);
+}

trunk/tests/PagePterTest.h

@@ -28 +28 @@
-        CPPUNIT_TEST (pageZoomWidth);
-        CPPUNIT_TEST (pageZoomFit);
+        CPPUNIT_TEST (pageDrag);
-        CPPUNIT_TEST_SUITE_END ();
-
@@ -36 +37 @@
-            void pageZoomWidth (void);
-            void pageZoomFit (void);
+            void pageDrag (void);
-
-        protected: