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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2007-01-04 14:32:17
Message-ID: 1167921137.155191.29191.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 619812 by ggarand:

backport 619811:
"fix infinite recursion when going from overflow:scroll to auto"


 M  +8 -2      render_layer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_layer.cpp #619811:619812
@@ -746,10 +746,16 @@
     bool scrollbarsChanged = (m_object->style()->overflowX() == OAUTO && \
                haveHorizontalBar != needHorizontalBar)
                           || (m_object->style()->overflowY() == OAUTO && \
haveVerticalBar != needVerticalBar);  if (scrollbarsChanged) {
-        if (m_object->style()->overflowX() == OAUTO)
+        if (m_object->style()->overflowX() == OAUTO) {
             showScrollbar(Qt::Horizontal, needHorizontalBar);
-        if (m_object->style()->overflowY() == OAUTO)
+            if (m_hBar) 
+                m_hBar->setEnabled(true);
+        }
+        if (m_object->style()->overflowY() == OAUTO) {
             showScrollbar(Qt::Vertical, needVerticalBar);
+            if (m_vBar)
+                m_vBar->setEnabled(true);
+        }
 
         m_object->setNeedsLayout(true);
 	if (m_object->isRenderBlock())


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