[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9c00300d8c76d443142bd78b56f8d2099ceff0dc
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 8 21:08:12 2002 +0000

    	Fix for image bullets.  They were neglecting to offset
    	themselves by their own width, and were just relying on
    	sheer luck (the default margin) to accommodate their
    	size.  The bug is 3007040 (borkware.com).
    
            Reviewed by: gramps
    
            * khtml/rendering/render_list.cpp:
            (RenderListMarker::paintObject):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index beef204..a98103c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2002-12-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for image bullets.  They were neglecting to offset
+	themselves by their own width, and were just relying on
+	sheer luck (the default margin) to accommodate their
+	size.  The bug is 3007040 (borkware.com).
+	
+        Reviewed by: gramps
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListMarker::paintObject):
+
 2002-12-07  David Hyatt  <hyatt at apple.com>
 
 	This change fixes three bugs in list items.  
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index beef204..a98103c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2002-12-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for image bullets.  They were neglecting to offset
+	themselves by their own width, and were just relying on
+	sheer luck (the default margin) to accommodate their
+	size.  The bug is 3007040 (borkware.com).
+	
+        Reviewed by: gramps
+
+        * khtml/rendering/render_list.cpp:
+        (RenderListMarker::paintObject):
+
 2002-12-07  David Hyatt  <hyatt at apple.com>
 
 	This change fixes three bugs in list items.  
diff --git a/WebCore/khtml/rendering/render_list.cpp b/WebCore/khtml/rendering/render_list.cpp
index 54a2f31..5e4c4bf 100644
--- a/WebCore/khtml/rendering/render_list.cpp
+++ b/WebCore/khtml/rendering/render_list.cpp
@@ -327,13 +327,25 @@ void RenderListMarker::paintObject(QPainter *p, int, int _y,
     int xoff = 0;
     int yoff = fm.ascent() - offset;
 
-    if(style()->listStylePosition() != INSIDE) {
+    if(style()->listStylePosition() == OUTSIDE) {
         xoff = -7 - offset;
         if(style()->direction() == RTL)
             xoff = -xoff + parent()->width();
     }
 
     if ( m_listImage && !m_listImage->isErrorImage()) {
+        // For OUTSIDE bullets shrink back to only a 0.3em margin. 0.67 em is too
+        // much.  This brings the margin back to MacIE/Gecko/WinIE levels.  
+        // For LTR don't forget to add in the width of the image to the offset as
+        // well (you are moving the image left, so you have to also add in the width
+        // of the image's border box as well). -dwh
+        if (style()->listStylePosition() == OUTSIDE) {
+            if (style()->direction() == LTR)
+                xoff -= m_listImage->pixmap().width() - fm.ascent()*1/3;
+            else
+                xoff -= fm.ascent()*1/3;
+        }
+        
         p->drawPixmap( QPoint( _tx + xoff, _ty ), m_listImage->pixmap());
         return;
     }

-- 
WebKit Debian packaging