[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/okular/ui
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2010-07-20 22:24:57
Message-ID: 20100720222457.CEBBCAC7E2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1152393 by aacid:

There was a change of behaviour somewhere and my infinite scrollbar bug prevention \
code got outdated, fix it Patch by mathieu lornac
BUGS: 227153


 M  +4 -5      pageview.cpp  


--- trunk/KDE/kdegraphics/okular/ui/pageview.cpp #1152392:1152393
@@ -139,7 +139,7 @@
     int refreshPage;
 
     // infinite resizing loop prevention
-    bool bothScrollbarsVisible;
+    bool verticalScrollBarVisible;
 
     // drag scroll
     QPoint dragScrollVector;
@@ -1238,21 +1238,20 @@
         return;
     }
 
-    if ( d->zoomMode == ZoomFitWidth && d->bothScrollbarsVisible && \
!horizontalScrollBar()->isVisible() && !verticalScrollBar()->isVisible() && \
qAbs(e->oldSize().height() - e->size().height()) < horizontalScrollBar()->height() * \
1.25 ) +    if ( d->zoomMode == ZoomFitWidth && d->verticalScrollBarVisible && \
!verticalScrollBar()->isVisible() && qAbs(e->oldSize().height() - e->size().height()) \
< verticalScrollBar()->width() )  {
         // this saves us from infinite resizing loop because of scrollbars appearing \
and disappearing  // see bug 160628 for more info
         // TODO looks are still a bit ugly because things are left uncentered 
         // but better a bit ugly than unusable
-        d->bothScrollbarsVisible = false;
+        d->verticalScrollBarVisible = false;
         resizeContentArea( e->size() );
         return;
     }
 
     // start a timer that will refresh the pixmap after 0.2s
     d->delayRelayoutTimer->start( 200 );
-
-    d->bothScrollbarsVisible = horizontalScrollBar()->isVisible() && \
verticalScrollBar()->isVisible(); +    d->verticalScrollBarVisible = \
verticalScrollBar()->isVisible();  }
 
 void PageView::keyPressEvent( QKeyEvent * e )


[prev in list] [next in list] [prev in thread] [next in thread]