Changeset 266

Timestamp:

Feb 24, 2009, 3:34:50 PM (12 years ago)

Author:

Eugene Romanenko

Message:

small changes

Location:

trunk/Lucide/SOURCE/gui

Files:

• docViewer.cpp (modified) (20 diffs)
• docViewer.h (modified) (4 diffs)
• lucide.h (modified) (1 diff)

trunk/Lucide/SOURCE/gui/docViewer.cpp

@@ -99 +99 @@
     drawareaIndex = 0;
     closed        = true;
+    layout        = SinglePage;
     // continuous view
-    continuous  = false;
     pagesizes   = NULL;
     realVscrollMax = 0;
@@ -297 +297 @@
 
 // sets the page layout
-void DocumentViewer::setPageLayout( PgLayout layout )
-{
-    continuous = ( layout == Continuous );
+void DocumentViewer::setPageLayout( PgLayout _layout )
+{
+    layout = _layout;
     if ( doc != NULL ) {
         long pg = currentpage;
         drawPage();
-        if ( continuous ) {
+        if ( isContinuous() ) {
             goToPage( pg );
         }
@@ -346 +346 @@
     }
 
-    if ( continuous && ( doc != NULL ) )
+    if ( isContinuous() && ( doc != NULL ) )
     {
         bool needRedraw = ( page == currentpage );
@@ -450 +450 @@
 void DocumentViewer::copyToClipbrd()
 {
-    if ( continuous )
+    if ( isContinuous() )
     {
         std::string txt = "";
@@ -469 +469 @@
 void DocumentViewer::selectAll()
 {
-    if ( continuous )
+    if ( isContinuous() )
     {
         for ( long i = 0; i < totalpages; i++ )
@@ -594 +594 @@
 
         if ( zoom == -1 ) { // fit width
-            realzoom = (double)cxClient / ( continuous ? fullwidth : width );
+            realzoom = (double)cxClient / ( isContinuous() ? fullwidth : width );
         }
         else if ( zoom == -2 ) { // fit page
@@ -613 +613 @@
 void DocumentViewer::drawPage()
 {
-    if ( !continuous )
+    if ( !isContinuous() )
     {
         LuDocument::freeRectangles( ev, selrects[ currentpage ] );
@@ -754 +754 @@
     else
     {
-        sHscrollMax = (SHORT)__max( 0, ( continuous ? fullwidth : width ) - cxClient );
+        sHscrollMax = (SHORT)__max( 0, ( isContinuous() ? fullwidth : width ) - cxClient );
         sHscrollPos = __min( sHscrollPos, sHscrollMax );
 
@@ -764 +764 @@
 
         VScrollStep = 1;
-        if ( continuous )
+        if ( isContinuous() )
         {
             realVscrollMax = __max( 0, fullheight - cyClient );
@@ -785 +785 @@
         WinSendMsg( hWndVscroll, SBM_SETSCROLLBAR,
                     MPFROMSHORT(sVscrollPos), MPFROM2SHORT(0, sVscrollMax) );
-        if ( continuous ) {
+        if ( isContinuous() ) {
             WinSendMsg( hWndVscroll, SBM_SETTHUMBSIZE,
                         MPFROM2SHORT( cyClient/VScrollStep, fullheight/VScrollStep ), MPVOID );
@@ -1448 +1448 @@
 void DocumentViewer::docPosToWinPos( long pagenum, LuRectangle *r, PRECTL rcl )
 {
-    double yplus = continuous ? pagenumToPos( pagenum ) : 0;
+    double yplus = isContinuous() ? pagenumToPos( pagenum ) : 0;
     double w = pagesizes[ pagenum ].x;
     double h = pagesizes[ pagenum ].y;
@@ -1490 +1490 @@
         rcl->xRight += xPos;
     }
-    if ( !continuous )
+    if ( !isContinuous() )
     {
         LONG ph = h * realzoom;
@@ -1626 +1626 @@
             selectionEnd.y = ypos;
 
-            if ( continuous )
+            if ( isContinuous() )
             {
                 scrollToPos( hwnd, NULLHANDLE, xpos, ypos, true );
@@ -1705 +1705 @@
         {
             long pg = currentpage;
-            if ( continuous ) {
+            if ( isContinuous() ) {
                 double tmp;
                 pg = posToPagenum( ypos, &tmp );
@@ -1765 +1765 @@
 
         long pg = currentpage;
-        if ( continuous ) {
+        if ( isContinuous() ) {
             double tmp;
             pg = posToPagenum( ypos, &tmp );
@@ -1849 +1849 @@
                 else
                 {
-                    bool dojump = ( !continuous && ( sVscrollPos == 0 )
+                    bool dojump = ( !isContinuous() && ( sVscrollPos == 0 )
                                         && ( currentpage > 0 ) );
 
@@ -1874 +1874 @@
                 else
                 {
-                    bool dojump = ( !continuous && ( sVscrollPos == sVscrollMax ) );
+                    bool dojump = ( !isContinuous() && ( sVscrollPos == sVscrollMax ) );
 
                     if ( fullscreen || dojump ) {
@@ -1941 +1941 @@
 void DocumentViewer::wmButton1Down( HWND hwnd, SHORT xpos, SHORT ypos )
 {
-    if ( continuous && ( doc != NULL ) )
+    if ( isContinuous() && ( doc != NULL ) )
     {
         // clear selection
@@ -2104 +2104 @@
         case WM_PAINT:
             if ( _this->enableAsynchDraw ) {
-                if ( _this->continuous ) {
+                if ( _this->isContinuous() ) {
                     _this->wmPaintContAsynch( hwnd );
                 } else {
@@ -2110 +2110 @@
                 }
             } else {
-                if ( _this->continuous ) {
+                if ( _this->isContinuous() ) {
                     _this->wmPaintCont( hwnd );
                 } else {

trunk/Lucide/SOURCE/gui/docViewer.h

@@ -61 +61 @@
 
         void setPageLayout( PgLayout layout );
-        PgLayout getPageLayout() { return ( continuous ? Continuous : SinglePage ); }
+        PgLayout getPageLayout() { return layout; }
 
         HWND getFrameHWND() { return hWndDocFrame; }
@@ -123 +123 @@
         double pagenumToPos( long pagenum );
         bool isRotated() { return ( (rotation==90) || (rotation==270) ); }
+        bool isContinuous() { return ( layout == Continuous ); };
 
         static MRESULT EXPENTRY docViewProc( HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2 );
@@ -163 +164 @@
         bool closed;
         bool drawPS;
+        PgLayout layout;
         
         // fullscreen
@@ -174 +176 @@
 
         // continuous view
-        bool continuous;
         LuSize *pagesizes;
         SHORT VScrollStep;

trunk/Lucide/SOURCE/gui/lucide.h

@@ -42 +42 @@
 class ProgressDlg;
 
-enum PgLayout { SinglePage = 0, Continuous = 1 };
+enum PgLayout { SinglePage = 0, Continuous = 1, TwoPages = 2 };
 enum ActiveWindow { AwIndex, AwView };
 enum FileList { ListFirst, ListPrevious, ListNext, ListLast };