office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-13 13:11:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

Browse source
This commit is contained in:
Albert Astals Cid 2013-11-28 00:06:13 +01:00
parent 88eddf4c5f 9c3165d214
commit 56c6b61311
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/document.cpp
View file

@ -3193,9 +3193,15 @@ void Document::setPrevViewport()
{ {
if ( d->m_viewportIterator != d->m_viewportHistory.begin() ) if ( d->m_viewportIterator != d->m_viewportHistory.begin() )
{ {
const int oldViewportPage = (*d->m_viewportIterator).pageNumber;
// restore previous viewport and notify it to observers // restore previous viewport and notify it to observers
--d->m_viewportIterator; --d->m_viewportIterator;
foreachObserver( notifyViewportChanged( true ) ); foreachObserver( notifyViewportChanged( true ) );
const int currentViewportPage = (*d->m_viewportIterator).pageNumber;
if (oldViewportPage != currentViewportPage)
foreachObserver( notifyCurrentPageChanged( oldViewportPage, currentViewportPage ) );
} }
} }
@ -3206,9 +3212,15 @@ void Document::setNextViewport()
++nextIterator; ++nextIterator;
if ( nextIterator != d->m_viewportHistory.end() ) if ( nextIterator != d->m_viewportHistory.end() )
{ {
const int oldViewportPage = (*d->m_viewportIterator).pageNumber;
// restore next viewport and notify it to observers // restore next viewport and notify it to observers
++d->m_viewportIterator; ++d->m_viewportIterator;
foreachObserver( notifyViewportChanged( true ) ); foreachObserver( notifyViewportChanged( true ) );
const int currentViewportPage = (*d->m_viewportIterator).pageNumber;
if (oldViewportPage != currentViewportPage)
foreachObserver( notifyCurrentPageChanged( oldViewportPage, currentViewportPage ) );
} }
} }