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

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/khtml/ecma
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2008-09-15 4:21:34
Message-ID: 1221452494.033149.18686.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 861082 by ggarand:

automatically merged revision 859313:
remove remaining incorrect use of hidesOverflow - use hasOverflowClip
instead. It knows the real overflow status.

fixes www.dhteumeuleu.com's thumbnail-loading in the gallery.

 M  +6 -6      kjs_dom.cpp  


--- branches/KDE/4.1/kdelibs/khtml/ecma/kjs_dom.cpp #861081:861082
@@ -388,16 +388,16 @@
       return rend ? jsNumber(rend->scrollHeight()) : jsUndefined();
     case ScrollLeft:
       if (rend && rend->layer()) {
-          if (rend->isRoot() && !rend->style()->hidesOverflow())
+          if (rend->isRoot() && !rend->hasOverflowClip())
               return jsNumber( node.document()->view() ? node.document()->view()->contentsX() : 0);
-          return jsNumber( rend->layer()->scrollXOffset() );
+          return jsNumber( rend->hasOverflowClip() ? rend->layer()->scrollXOffset() : 0 );
       }
       return jsNumber( 0 );
     case ScrollTop:
       if (rend && rend->layer()) {
-          if (rend->isRoot() && !rend->style()->hidesOverflow())
+          if (rend->isRoot() && !rend->hasOverflowClip())
               return jsNumber( node.document()->view() ? node.document()->view()->contentsY() : 0);
-          return jsNumber( rend->layer()->scrollYOffset() );
+          return jsNumber( rend->hasOverflowClip() ? rend->layer()->scrollYOffset() : 0 );
       }
       return jsNumber( 0 );
     default:
@@ -519,7 +519,7 @@
     switch (token) {
       case ScrollLeft:
         if (rend && rend->layer()) {
-          if (rend->style()->hidesOverflow())
+          if (rend->hasOverflowClip())
             rend->layer()->scrollToXOffset(value->toInt32(exec));
           else if (rend->isRoot()) {
             KHTMLView* sview = node.document()->view();
@@ -530,7 +530,7 @@
         break;
       case ScrollTop:
         if (rend && rend->layer()) {
-          if (rend->style()->hidesOverflow())
+          if (rend->hasOverflowClip())
             rend->layer()->scrollToYOffset(value->toInt32(exec));
           else if (rend->isRoot()) {
             KHTMLView* sview = node.document()->view();
[prev in list] [next in list] [prev in thread] [next in thread]