Changeset 285 for trunk/Lucide/SOURCE/gui

Timestamp:

Jan 6, 2010, 5:47:40 PM (11 years ago)

Author:

rbri

Message:

Zoom out by right mouse button
initial impl for vert scrolling via mouse drag

Location:

trunk/Lucide/SOURCE/gui

Files:

• docViewer.cpp (modified) (6 diffs)
• docViewer.h (modified) (5 diffs)

trunk/Lucide/SOURCE/gui/docViewer.cpp

@@ -671 +671 @@
     }
 
-    if ( SHORT2FROMMP( mp2 ) != SB_PAGEDRAG ) { 
+    if ( SHORT2FROMMP( mp2 ) != SB_PAGEDRAG ) {
         sVscrollInc = __max( -sVscrollPos * VScrollStep, __min( sVscrollInc,
                               ( sVscrollMax - sVscrollPos ) * VScrollStep ) );
@@ -714 +714 @@
         case SB_SLIDERPOSITION:
             sHscrollInc = SHORT1FROMMP( mp2 ) - sHscrollPos;
+            break;
+        case SB_PAGEDRAG:
+            sHscrollInc = (SHORT)SHORT1FROMMP( mp2 );
             break;
     }
@@ -1717 +1720 @@
             docDraggingEnd.x = xpos;
             docDraggingEnd.y = ypos;
+ 
+            SHORT hMove = docDraggingEnd.x - docDraggingStart.x;
+            if ( abs( hMove ) > 5 )
+            {
+                horizScroll( hwnd, MPFROM2SHORT( hMove, SB_PAGEDRAG ) );
+                docDraggingStart.x = xpos;
+            }
 
             SHORT vMove = docDraggingEnd.y - docDraggingStart.y;
-            if ( abs( vMove ) > 5 ) 
-            {            
+            if ( abs( vMove ) > 5 )
+            {
                 vertScroll( hwnd, MPFROM2SHORT( vMove, SB_PAGEDRAG ) );
-                docDraggingStart.x = xpos;
                 docDraggingStart.y = ypos;
             }
@@ -1844 +1853 @@
 }
 
+// handles WM_BUTTON2CLICK
+BOOL DocumentViewer::wmRightClick( HWND hwnd, SHORT xpos, SHORT ypos )
+{
+    if ( zoomMode )
+    {
+        zoomInOut( false );
+        return TRUE;
+    }
+    return FALSE;
+}
+
 BOOL DocumentViewer::wmChar( HWND hwnd, MPARAM mp1, MPARAM mp2 )
 {
@@ -2178 +2198 @@
             _this->wmButton2Down( hwnd, SHORT1FROMMP( mp1 ), SHORT2FROMMP( mp1 ) );
             break;
-            
+
         case WM_BUTTON2UP:
             _this->wmButton2Up();
             break;
-            
+
         case WM_MOUSEMOVE:
             if ( _this->wmMouseMove( hwnd, SHORT1FROMMP( mp1 ), SHORT2FROMMP( mp1 ) ) ) {
@@ -2191 +2211 @@
         case WM_BUTTON1CLICK:
             if ( _this->wmClick( hwnd, SHORT1FROMMP( mp1 ), SHORT2FROMMP( mp1 ) ) ) {
+                return (MRESULT)TRUE;
+            }
+            break;
+
+        case WM_BUTTON2CLICK:
+            if ( _this->wmRightClick( hwnd, SHORT1FROMMP( mp1 ), SHORT2FROMMP( mp1 ) ) ) {
                 return (MRESULT)TRUE;
             }

trunk/Lucide/SOURCE/gui/docViewer.h

@@ -22 +22 @@
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the LGPL are applicable instead of those
- * above. If you wish to allow use of your version of this file only under the 
+ * above. If you wish to allow use of your version of this file only under the
  * terms of the LGPL, and not to allow others to use your version of this file
  * under the terms of the CDDL, indicate your decision by deleting the
  * provisions above and replace them with the notice and other provisions
  * required by the LGPL. If you do not delete the provisions above, a recipient
- * may use your version of this file under the terms of any one of the CDDL 
+ * may use your version of this file under the terms of any one of the CDDL
  * or the LGPL.
  *
@@ -91 +91 @@
         void drawPage();
         void adjustSize();
-                void countPagesizes();
+        void countPagesizes();
 
         MRESULT vertScroll( HWND hwnd, MPARAM mp2 );
         MRESULT horizScroll( HWND hwnd, MPARAM mp2 );
         MRESULT wmDragOver( PDRAGINFO dragInfo );
-                void wmDrop( PDRAGINFO dragInfo );
-                void wmSize( HWND hwnd, MPARAM mp2 );
+        void wmDrop( PDRAGINFO dragInfo );
+        void wmSize( HWND hwnd, MPARAM mp2 );
         void wmPaint( HWND hwnd );
         void wmPaintCont( HWND hwnd );
@@ -108 +108 @@
         BOOL wmMouseMove( HWND hwnd, SHORT xpos, SHORT ypos );
         BOOL wmClick( HWND hwnd, SHORT xpos, SHORT ypos );
+        BOOL wmRightClick( HWND hwnd, SHORT xpos, SHORT ypos );
         BOOL wmChar( HWND hwnd, MPARAM mp1, MPARAM mp2 );
-                void wmTimer( USHORT idTimer );
+        void wmTimer( USHORT idTimer );
         void winPosToDocPos( PPOINTL startpoint, PPOINTL endpoint, LuRectangle *r );
         void winPosToDocPos( PageDrawArea *pda, LuRectangle *r );
@@ -172 +173 @@
         POINTL docDraggingStart;
         POINTL docDraggingEnd;
-        
+
         // fullscreen
         bool fullscreen;
@@ -212 +213 @@
         bool continueSearch;
         bool abortSearch;
-        
+
         // pointers
         HPOINTER handPtr;