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

List:       kde-commits
Subject:    kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2005-02-28 20:39:51
Message-ID: 20050228203951.C5E60148A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by ggarand: 

only paint root line boxes background that are affected by a first-line
style (merge).

BUG:96865


  M +2 -1      render_line.cpp   1.21


--- kdelibs/khtml/rendering/render_line.cpp  #1.20:1.21
@@ -523,5 +523,6 @@ void InlineFlowBox::paintBackgroundAndBo
     // a line may actually have to paint a background.
     RenderStyle* styleToUse = object()->style(m_firstLine);
-    if (object()->hasFirstLine() || (parent() && object()->shouldPaintBackgroundOrBorder())) {
+    if ((!parent() && m_firstLine && styleToUse != object()->style()) || 
+        (parent() && object()->shouldPaintBackgroundOrBorder())) {
         CachedImage* bg = styleToUse->backgroundImage();
         bool hasBackgroundImage = bg && (bg->pixmap_size() == bg->valid_rect().size()) &&


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