Ignore:
Timestamp:
Sep 4, 2007, 5:02:46 PM (14 years ago)
Author:
Eugene Romanenko
Message:

fix ignore margins

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Lucide/SOURCE/gui/print.cpp

    r183 r245  
    240240
    241241    // Magrins
    242     LONG mLeft   = __max( psetup->margin_left, pcurForm->xLeftClip );
    243     LONG mBottom = __max( psetup->margin_bottom, pcurForm->yBottomClip );
    244     LONG mRight  = __max( psetup->margin_right, pcurForm->cx - pcurForm->xRightClip );
    245     LONG mTop    = __max( psetup->margin_top, pcurForm->cy - pcurForm->yTopClip );
     242    LONG mLeft   = psetup->margin_left;
     243    LONG mBottom = psetup->margin_bottom;
     244    LONG mRight  = psetup->margin_right;
     245    LONG mTop    = psetup->margin_top;
    246246
    247247    // Count paper page size in hi-metric
    248     LONG pwidth = ( pcurForm->cx - mLeft - mRight ) * UNITS_MULTIPLIER;
     248    LONG pwidth = ( pcurForm->cx - psetup->margin_left - mRight ) * UNITS_MULTIPLIER;
    249249    LONG pheight = ( pcurForm->cy - mTop - mBottom ) * UNITS_MULTIPLIER;
    250250
     
    274274        yPos = pheight - prheight;
    275275    }
    276     RECTL rclDraw = { mLeft*UNITS_MULTIPLIER, (mBottom*UNITS_MULTIPLIER)+yPos,
     276    RECTL rclDraw = { psetup->margin_left*UNITS_MULTIPLIER, (mBottom*UNITS_MULTIPLIER)+yPos,
    277277                      prwidth, prheight+yPos };
    278278
     
    326326
    327327    // Magrins
    328     LONG mLeft   = __max( psetup->margin_left, curForm.xLeftClip );
    329     LONG mBottom = __max( psetup->margin_bottom, curForm.yBottomClip );
    330     LONG mRight  = __max( psetup->margin_right, curForm.cx - curForm.xRightClip );
    331     LONG mTop    = __max( psetup->margin_top, curForm.cy - curForm.yTopClip );
     328    LONG mLeft   = psetup->margin_left;
     329    LONG mBottom = psetup->margin_bottom;
     330    LONG mRight  = psetup->margin_right;
     331    LONG mTop    = psetup->margin_top;
    332332
    333333    // Count paper page size in 1/72 inches
Note: See TracChangeset for help on using the changeset viewer.