From e79719b93ab8377d931721757028d2a4d9ffb37e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 10 Jul 2014 23:14:01 +0200 Subject: [PATCH] reorder conditions to make the valgrind warning go away --- ui/pageview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pageview.cpp b/ui/pageview.cpp index b00dd3e92..fac1486ba 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -1645,7 +1645,7 @@ void PageView::resizeEvent( QResizeEvent *e ) return; } - if ( ( d->zoomMode == ZoomFitWidth || d->zoomMode == ZoomFitAuto ) && d->verticalScrollBarVisible && !verticalScrollBar()->isVisible() && qAbs(e->oldSize().height() - e->size().height()) < verticalScrollBar()->width() ) + if ( ( d->zoomMode == ZoomFitWidth || d->zoomMode == ZoomFitAuto ) && !verticalScrollBar()->isVisible() && qAbs(e->oldSize().height() - e->size().height()) < verticalScrollBar()->width() && d->verticalScrollBarVisible ) { // this saves us from infinite resizing loop because of scrollbars appearing and disappearing // see bug 160628 for more info @@ -1655,7 +1655,7 @@ void PageView::resizeEvent( QResizeEvent *e ) resizeContentArea( e->size() ); return; } - else if ( d->zoomMode == ZoomFitAuto && d->horizontalScrollBarVisible && !horizontalScrollBar()->isVisible() && qAbs(e->oldSize().width() - e->size().width()) < horizontalScrollBar()->height() ) + else if ( d->zoomMode == ZoomFitAuto && !horizontalScrollBar()->isVisible() && qAbs(e->oldSize().width() - e->size().width()) < horizontalScrollBar()->height() && d->horizontalScrollBarVisible ) { // this saves us from infinite resizing loop because of scrollbars appearing and disappearing // TODO looks are still a bit ugly because things are left uncentered