is a PDF viewer for X.
| TileMap.cc (xpdf-4.03) | : | TileMap.cc (xpdf-4.04) |
|---|
| | |
| skipping to change at line 789 | | skipping to change at line 789 |
|---|
| if (totalH < state->getWinH()) { | | if (totalH < state->getWinH()) { |
| offsetY = (state->getWinH() - totalH) / 2; | | offsetY = (state->getWinH() - totalH) / 2; |
| } else { | | } else { |
| offsetY = 0; | | offsetY = 0; |
| } | | } |
| *xw = xd + offsetX - state->getScrollX(); | | *xw = xd + offsetX - state->getScrollX(); |
| *yw = pageY[pg - 1] + yd + offsetY - state->getScrollY(); | | *yw = pageY[pg - 1] + yd + offsetY - state->getScrollY(); |
| break; | | break; |
| | |
| case displaySideBySideSingle: | | case displaySideBySideSingle: |
|
| if (!(pg == state->getScrollPage() || | | leftPg = (state->getScrollPage() - 1) | 1; |
| (pg == state->getScrollPage() + 1 && | | if (!(pg == leftPg || |
| state->getScrollPage() + 1 <= state->getDoc()->getNumPages()))) { | | (pg == leftPg + 1 && |
| | leftPg + 1 <= state->getDoc()->getNumPages()))) { |
| *xw = *yw = 0; | | *xw = *yw = 0; |
| return gFalse; | | return gFalse; |
| } | | } |
|
| pageW1 = pageW[state->getScrollPage() - 1]; | | pageW1 = pageW[leftPg - 1]; |
| pageH1 = pageH[state->getScrollPage() - 1]; | | pageH1 = pageH[leftPg - 1]; |
| if (state->getScrollPage() + 1 <= state->getDoc()->getNumPages()) { | | if (leftPg + 1 <= state->getDoc()->getNumPages()) { |
| pageW2 = pageW[state->getScrollPage()]; | | pageW2 = pageW[leftPg]; |
| pageH2 = pageH[state->getScrollPage()]; | | pageH2 = pageH[leftPg]; |
| } else { | | } else { |
| // display a single page as though there were a blank facing | | // display a single page as though there were a blank facing |
| // page of the same size | | // page of the same size |
| pageW2 = pageW1; | | pageW2 = pageW1; |
| pageH2 = pageH1; | | pageH2 = pageH1; |
| } | | } |
| if (pageW1 + sideBySidePageSpacing + pageW2 < state->getWinW()) { | | if (pageW1 + sideBySidePageSpacing + pageW2 < state->getWinW()) { |
| offsetX = (state->getWinW() - | | offsetX = (state->getWinW() - |
| (pageW1 + sideBySidePageSpacing + pageW2)) / 2; | | (pageW1 + sideBySidePageSpacing + pageW2)) / 2; |
| } else { | | } else { |
| | |
| skipping to change at line 822 | | skipping to change at line 823 |
|---|
| offsetX2 = offsetX + pageW1 + sideBySidePageSpacing; | | offsetX2 = offsetX + pageW1 + sideBySidePageSpacing; |
| if (pageH1 < state->getWinH() && pageH2 < state->getWinH()) { | | if (pageH1 < state->getWinH() && pageH2 < state->getWinH()) { |
| if (pageH1 > pageH2) { | | if (pageH1 > pageH2) { |
| offsetY = (state->getWinH() - pageH1) / 2; | | offsetY = (state->getWinH() - pageH1) / 2; |
| } else { | | } else { |
| offsetY = (state->getWinH() - pageH2) / 2; | | offsetY = (state->getWinH() - pageH2) / 2; |
| } | | } |
| } else { | | } else { |
| offsetY = 0; | | offsetY = 0; |
| } | | } |
|
| if (pg == state->getScrollPage()) { | | if (pg == leftPg) { |
| *xw = xd + offsetX - state->getScrollX(); | | *xw = xd + offsetX - state->getScrollX(); |
|
| *yw = yd + offsetY - state->getScrollY(); | | |
| } else { | | } else { |
| *xw = xd + offsetX2 - state->getScrollX(); | | *xw = xd + offsetX2 - state->getScrollX(); |
|
| *yw = yd + offsetY - state->getScrollY(); | | |
| } | | } |
|
| | *yw = yd + offsetY - state->getScrollY(); |
| break; | | break; |
| | |
| case displaySideBySideContinuous: | | case displaySideBySideContinuous: |
| leftPg = (pg - 1) | 1; | | leftPg = (pg - 1) | 1; |
| pageW1 = pageW[leftPg - 1]; | | pageW1 = pageW[leftPg - 1]; |
| pageH1 = pageH[leftPg - 1]; | | pageH1 = pageH[leftPg - 1]; |
| if (maxW + sideBySidePageSpacing + maxW2 < state->getWinW()) { | | if (maxW + sideBySidePageSpacing + maxW2 < state->getWinW()) { |
| offsetX = (state->getWinW() - | | offsetX = (state->getWinW() - |
| (maxW + sideBySidePageSpacing + maxW2)) / 2; | | (maxW + sideBySidePageSpacing + maxW2)) / 2; |
| } else { | | } else { |
| | | |
| End of changes. 6 change blocks. |
|---|
| 11 lines changed or deleted | | 11 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 