[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:       2005-10-08 0:12:07
Message-ID: 1128730327.252153.16788.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 468404 by ggarand:

the linebox might actually not be created if we are all whitespace,
so lets always set staticY as a backup plan.



 M  +3 -3      bidi.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/bidi.cpp #468403:468404
@@ -1581,7 +1581,7 @@
       bool nssx, nssy;
       bool isInlineType = o->style()->isOriginalDisplayInlineType();
       nssx = o->hasStaticX();
-      if (o->hasStaticX() && !isInlineType && o->isBox()) {
+      if (nssx && !isInlineType && o->isBox()) {
           static_cast<RenderBox*>(o)->setStaticX(o->parent()->style()->direction() == LTR ?
                                   p->borderLeft()+p->paddingLeft() :
                                   p->borderRight()+p->paddingRight());
@@ -1591,9 +1591,9 @@
       // If our original display was an INLINE type, then we can
       // determine our static y position now.
       nssy = o->hasStaticY();
-      if (o->hasStaticY() && isInlineType && o->isBox()) {
+      if (nssy && o->isBox()) {
           static_cast<RenderBox*>(o)->setStaticY(p->height());
-          nssy = false;
+          nssy = !isInlineType;
       }
       if (needToSetStaticX) *needToSetStaticX = nssx;
       if (needToSetStaticY) *needToSetStaticY = nssy;
[prev in list] [next in list] [prev in thread] [next in thread]