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

This commit is contained in:
Albert Astals Cid 2013-11-28 00:06:13 +01:00
commit 56c6b61311

View file

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