Changeset 3421 in webkit

Timestamp:

Jan 23, 2003, 11:42:10 AM (22 years ago)

Author:

hyatt

Message:

Fix for 3134613, bullets overlapping text on weather.com. Make
sure min/max widths get updated when the marker moves around.

Reviewed by john

• khtml/rendering/render_list.cpp: (RenderListItem::updateMarkerLocation): (RenderListItem::calcMinMaxWidth): (RenderListItem::layout):
• khtml/rendering/render_list.h:

Location:

trunk/WebCore

Files:

• ChangeLog-2003-10-25 (modified) (1 diff)
• ChangeLog-2005-08-23 (modified) (1 diff)
• khtml/rendering/render_list.cpp (modified) (2 diffs)
• khtml/rendering/render_list.h (modified) (1 diff)

trunk/WebCore/ChangeLog-2003-10-25

@@ +1 @@
+2003-01-23  David Hyatt  <hyatt@apple.com>
+
+        Fix for 3134613, bullets overlapping text on weather.com.  Make
+        sure min/max widths get updated when the marker moves around.
+        
+        Reviewed by john
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::updateMarkerLocation):
+        (RenderListItem::calcMinMaxWidth):
+        (RenderListItem::layout):
+        * khtml/rendering/render_list.h:
+
 === Safari-54 ===
 

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2003-01-23  David Hyatt  <hyatt@apple.com>
+
+        Fix for 3134613, bullets overlapping text on weather.com.  Make
+        sure min/max widths get updated when the marker moves around.
+        
+        Reviewed by john
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListItem::updateMarkerLocation):
+        (RenderListItem::calcMinMaxWidth):
+        (RenderListItem::layout):
+        * khtml/rendering/render_list.h:
+
 === Safari-54 ===
 

trunk/WebCore/khtml/rendering/render_list.cpp

@@ -214 +214 @@
 }
 
-void RenderListItem::layout( )
-{
-    KHTMLAssert( !layouted() );
-    KHTMLAssert( minMaxKnown() );
-
-    if ( !checkChildren() ) {
-        m_height = 0;
-        //kdDebug(0) << "empty item" << endl;
-        return;
-    }
-    
+void RenderListItem::updateMarkerLocation()
+{
     // Sanity check the location of our marker.
     if (m_marker) {
@@ -238 +229 @@
                 lineBoxParent = this;
             lineBoxParent->addChild(m_marker, lineBoxParent->firstChild());
-        }
+            if (!m_marker->minMaxKnown())
+                m_marker->calcMinMaxWidth();
+            recalcMinMaxWidths();
+        }
+    }
+}
+
+void RenderListItem::calcMinMaxWidth()
+{
+    // Make sure our marker is in the correct location.
+    updateMarkerLocation();
+    if (!minMaxKnown())
+        RenderFlow::calcMinMaxWidth();
+}
+
+void RenderListItem::layout( )
+{
+    KHTMLAssert( !layouted() );
+    KHTMLAssert( minMaxKnown() );
+
+    if ( !checkChildren() ) {
+        m_height = 0;
+        //kdDebug(0) << "empty item" << endl;
+        return;
     }
     
+    updateMarkerLocation();    
     RenderFlow::layout();
 }

trunk/WebCore/khtml/rendering/render_list.h

@@ -102 +102 @@
 
     virtual void layout( );
+    virtual void calcMinMaxWidth();
+    
+    void updateMarkerLocation();
     
     void setNotInList(bool notInList) { _notInList = notInList; }