Changeset 6395 in webkit

Timestamp:

Apr 15, 2004, 6:07:35 PM (21 years ago)

Author:

hyatt

Message:

Fix for 3624335, bugs with overflow and positioned objects. The scrollbar didn't properly update
as you changed the sizes of positioned objects inside an overflow block.

Reviewed by rjw

• khtml/rendering/render_block.cpp: (khtml::RenderBlock::layoutBlock):
• khtml/rendering/render_flexbox.cpp: (khtml::RenderFlexibleBox::layoutBlock):
• khtml/rendering/render_layer.cpp: (RenderLayer::updateScrollInfoAfterLayout):

Location:

trunk/WebCore

Files:

• ChangeLog-2005-08-23 (modified) (1 diff)
• khtml/rendering/render_block.cpp (modified) (1 diff)
• khtml/rendering/render_flexbox.cpp (modified) (1 diff)
• khtml/rendering/render_layer.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2004-04-15  David Hyatt  <hyatt@apple.com>
+
+        Fix for 3624335, bugs with overflow and positioned objects.  The scrollbar didn't properly update
+        as you changed the sizes of positioned objects inside an overflow block.
+        
+        Reviewed by rjw
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::layoutBlock):
+        * khtml/rendering/render_flexbox.cpp:
+        (khtml::RenderFlexibleBox::layoutBlock):
+        * khtml/rendering/render_layer.cpp:
+        (RenderLayer::updateScrollInfoAfterLayout):
+
 2004-04-15  Ken Kocienda  <kocienda@apple.com>
 

trunk/WebCore/khtml/rendering/render_block.cpp

@@ -377 +377 @@
         // All we have to is lay out our positioned objects.
         layoutPositionedObjects(relayoutChildren);
+        if (hasOverflowClip())
+            m_layer->updateScrollInfoAfterLayout();
         setNeedsLayout(false);
         return;

trunk/WebCore/khtml/rendering/render_flexbox.cpp

@@ -247 +247 @@
         // All we have to is lay out our positioned objects.
         layoutPositionedObjects(relayoutChildren);
+        if (hasOverflowClip())
+            m_layer->updateScrollInfoAfterLayout();
         setNeedsLayout(false);
         return;

trunk/WebCore/khtml/rendering/render_layer.cpp

@@ -669 +669 @@
 #else
         m_hBar->setRange(0, m_scrollWidth-clientWidth);
+        m_object->repaintRectangle(QRect(m_object->borderLeft(), m_object->borderTop() + clientHeight(),
+                                   horizontalScrollbarHeight(),
+                                   m_object->width() - m_object->borderLeft() - m_object->borderRight()));
 #endif
     }
@@ -681 +684 @@
         m_vBar->setRange(0, m_scrollHeight-clientHeight);
 #endif
-    }
+        m_object->repaintRectangle(QRect(m_object->borderLeft() + m_object->clientWidth(),
+                                   m_object->borderTop(), verticalScrollbarWidth(), 
+                                   m_object->height() - m_object->borderTop() - m_object->borderBottom()));
+    }
+    
+    m_object->repaint();
 }