office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve facing pages (center first page) mode when document contains only 1 or 2 pages

Browse source 
REVIEW: 103424
This commit is contained in:
Stephen Anthony 2011-12-21 01:44:33 +01:00 committed by Albert Astals Cid
parent ee684dc516
commit a6dba2434f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ui/pageview.cpp
View file

@ -3639,11 +3639,14 @@ void PageView::slotRelayoutPages()
QRect viewportRect( horizontalScrollBar()->value(), verticalScrollBar()->value(), viewportWidth, viewportHeight );
// handle the 'center first page in row' stuff
int nCols = viewColumns();
const bool centerFirstPage = Okular::Settings::viewMode() == Okular::Settings::EnumViewMode::FacingFirstCentered;
const bool centerLastPage = centerFirstPage && d->items.count() % 2 == 0;
const bool facing = Okular::Settings::viewMode() == Okular::Settings::EnumViewMode::Facing;
const bool facingCentered = Okular::Settings::viewMode() == Okular::Settings::EnumViewMode::FacingFirstCentered;
const bool overrideCentering = facingCentered && pageCount < 3;
const bool centerFirstPage = facingCentered && !overrideCentering;
const bool facingPages = facing || centerFirstPage;
const bool centerLastPage = centerFirstPage && pageCount % 2 == 0;
const bool continuousView = Okular::Settings::viewContinuous();
const bool facingPages = centerFirstPage || Okular::Settings::viewMode() == Okular::Settings::EnumViewMode::Facing;
int nCols = overrideCentering ? 1 : viewColumns();
// set all items geometry and resize contents. handle 'continuous' and 'single' modes separately
@ -3725,7 +3728,7 @@ void PageView::slotRelayoutPages()
if ( continuousView || rIdx == pageRowIdx )
{
const bool reallyDoCenterFirst = item->pageNumber() == 0 && centerFirstPage;
const bool reallyDoCenterLast = item->pageNumber() == d->items.count() - 1 && centerLastPage;
const bool reallyDoCenterLast = item->pageNumber() == pageCount - 1 && centerLastPage;
int actualX = 0;
if ( reallyDoCenterFirst || reallyDoCenterLast )
{