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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/rendering
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2006-09-24 16:30:38
Message-ID: 1159115438.272021.12829.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587994 by carewolf:

Don't add these borders. It's wrong.
BUG:133132


 M  +9 -9      render_layer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/rendering/render_layer.cpp #587993:587994
@@ -902,9 +902,9 @@
         setClip(p, paintDirtyRect, clipRectToApply);
 
         RenderObject::PaintInfo paintInfo(p, clipRectToApply, PaintActionSelection);
-        
+
         int tx = x - renderer()->xPos();
-        int ty = y - renderer()->yPos() + renderer()->borderTopExtra();              \
 +        int ty = y - renderer()->yPos() + renderer()->borderTopExtra();
 
         if (selectionOnly)
             renderer()->paint(paintInfo, tx, ty);
@@ -1039,8 +1039,8 @@
     // Next we want to see if the mouse pos is inside the child RenderObjects of the \
layer.  if (containsPoint(xMousePos, yMousePos, fgRect) &&
         renderer()->nodeAtPoint(info, xMousePos, yMousePos,
-                            layerBounds.x() - renderer()->xPos() + \
                m_object->borderLeft(), 
-                            layerBounds.y() - renderer()->yPos() + \
m_object->borderTopExtra() - m_object->borderBottom(), +                            \
layerBounds.x() - renderer()->xPos(), +                            layerBounds.y() - \
renderer()->yPos() + m_object->borderTopExtra(),  HitTestChildrenOnly)) {
 	if (info.innerNode() != m_object->element())
 	    return this;
@@ -1060,8 +1060,8 @@
     // Next we want to see if the mouse pos is inside this layer but not any of its \
children.  if (containsPoint(xMousePos, yMousePos, bgRect) &&
         renderer()->nodeAtPoint(info, xMousePos, yMousePos,
-                                layerBounds.x() - renderer()->xPos() + \
                m_object->borderLeft(), 
-                                layerBounds.y() - renderer()->yPos() + \
m_object->borderTopExtra() - m_object->borderBottom(), +                              \
layerBounds.x() - renderer()->xPos(), +                                \
layerBounds.y() - renderer()->yPos() + m_object->borderTopExtra(),  HitTestSelfOnly))
         return this;
 
@@ -1352,7 +1352,7 @@
 {
     if (!m_overflowListDirty)
         return;
-        
+
     for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
         if (child->isOverflowOnly()) {
             if (!m_overflowList)
@@ -1488,8 +1488,8 @@
 
 bool RenderLayer::shouldBeOverflowOnly() const
 {
-    return renderer()->style() && renderer()->hasOverflowClip() && 
-           !renderer()->isPositioned() &&  !renderer()->isRelPositioned(); 
+    return renderer()->style() && renderer()->hasOverflowClip() &&
+           !renderer()->isPositioned() &&  !renderer()->isRelPositioned();
            /* && !isTransparent(); */
 }
 


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