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

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/khtml/patches
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-03-29 14:51:52
Message-ID: 1143643912.201022.31514.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523997 by eva:

fix this patch for being applied after the frame scrolling patch (was
moved to qt3 set of patches)


 M  +8 -3      qt3scrollview_qt2.3.patch  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/qt3scrollview_qt2.3.patch #523996:523997
@@ -216,17 +216,22 @@
  
      //int w = visibleWidth();
      //int h = visibleHeight();
-@@ -781,8 +781,8 @@
-         if (document->isHTMLDocument()) {
+@@ -782,11 +782,11 @@
               NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
               if(body && body->renderer() && body->id() == ID_FRAMESET) {
+ #ifdef KHTML_NO_SCROLLBARS
 -                 QScrollView::setVScrollBarMode(AlwaysOff);
 -                 QScrollView::setHScrollBarMode(AlwaysOff);
 +                 Qt3ScrollView::setVScrollBarMode(AlwaysOff);
 +                 Qt3ScrollView::setHScrollBarMode(AlwaysOff);
+ #else
+-                 QScrollView::setVScrollBarMode(AlwaysOn);
+-                 QScrollView::setHScrollBarMode(AlwaysOn);
++                 Qt3ScrollView::setVScrollBarMode(AlwaysOn);
++                 Qt3ScrollView::setHScrollBarMode(AlwaysOn);
+ #endif
                   body->renderer()->setNeedsLayout(true);
  //                  if (d->tooltip) {
- //                      delete d->tooltip;
 @@ -875,7 +875,7 @@
  void KHTMLView::closeEvent( QCloseEvent* ev )
  {
[prev in list] [next in list] [prev in thread] [next in thread]