Changeset 245 for trunk/Lucide/SOURCE/gui/print.cpp

Timestamp:

Sep 4, 2007, 5:02:46 PM (13 years ago)

Author:

Eugene Romanenko

Message:

fix ignore margins

File:

• trunk/Lucide/SOURCE/gui/print.cpp (modified) (3 diffs)

trunk/Lucide/SOURCE/gui/print.cpp

@@ -240 +240 @@
 
     // Magrins
-    LONG mLeft   = __max( psetup->margin_left, pcurForm->xLeftClip );
-    LONG mBottom = __max( psetup->margin_bottom, pcurForm->yBottomClip );
-    LONG mRight  = __max( psetup->margin_right, pcurForm->cx - pcurForm->xRightClip );
-    LONG mTop    = __max( psetup->margin_top, pcurForm->cy - pcurForm->yTopClip );
+    LONG mLeft   = psetup->margin_left;
+    LONG mBottom = psetup->margin_bottom;
+    LONG mRight  = psetup->margin_right;
+    LONG mTop    = psetup->margin_top;
 
     // Count paper page size in hi-metric
-    LONG pwidth = ( pcurForm->cx - mLeft - mRight ) * UNITS_MULTIPLIER;
+    LONG pwidth = ( pcurForm->cx - psetup->margin_left - mRight ) * UNITS_MULTIPLIER;
     LONG pheight = ( pcurForm->cy - mTop - mBottom ) * UNITS_MULTIPLIER;
 
@@ -274 +274 @@
         yPos = pheight - prheight;
     }
-    RECTL rclDraw = { mLeft*UNITS_MULTIPLIER, (mBottom*UNITS_MULTIPLIER)+yPos,
+    RECTL rclDraw = { psetup->margin_left*UNITS_MULTIPLIER, (mBottom*UNITS_MULTIPLIER)+yPos,
                       prwidth, prheight+yPos };
 
@@ -326 +326 @@
 
     // Magrins
-    LONG mLeft   = __max( psetup->margin_left, curForm.xLeftClip );
-    LONG mBottom = __max( psetup->margin_bottom, curForm.yBottomClip );
-    LONG mRight  = __max( psetup->margin_right, curForm.cx - curForm.xRightClip );
-    LONG mTop    = __max( psetup->margin_top, curForm.cy - curForm.yTopClip );
+    LONG mLeft   = psetup->margin_left;
+    LONG mBottom = psetup->margin_bottom;
+    LONG mRight  = psetup->margin_right;
+    LONG mTop    = psetup->margin_top;
 
     // Count paper page size in 1/72 inches