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

List:       kde-commits
Subject:    branches/work/unity
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2006-07-11 19:17:10
Message-ID: 1152645430.666231.8637.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 561266 by hausmann:

 r233@rhea (orig r232):  zrusin | 2006-07-09 18:52:22 +0200
 make the scrollarea work
 


 _M            . (directory)  
 M  +5 -0      WebKit/WebCore/platform/qt/CanvasQt.cpp  
 M  +1 -0      WebKit/WebCore/platform/qt/CanvasQt.h  
 M  +2 -1      WebKit/WebCore/platform/qt/FrameQt.cpp  
 M  +6 -2      WebKit/WebCore/platform/qt/ScrollViewQt.cpp  
 M  +2 -0      WebKit/WebCore/platform/qt/test/testunity.cpp  


--- branches/work/unity/WebKit/WebCore/platform/qt/CanvasQt.cpp #561265:561266
@@ -8,6 +8,7 @@
 #include <QDebug>
 #include <QPainter>
 #include <QPaintEvent>
+#include "CanvasQt.h"
 
 using namespace WebCore;
 
@@ -25,4 +26,8 @@
 }
 
 
+QSize CanvasQt::sizeHint() const
+{
+    return QSize(600, 400);
+}
 // vim: ts=4 sw=4 et
--- branches/work/unity/WebKit/WebCore/platform/qt/CanvasQt.h #561265:561266
@@ -15,6 +15,7 @@
 public:
     CanvasQt(WebCore::ScrollView *frameView, QWidget *parent=0);
 
+    virtual QSize sizeHint() const;
 protected:
     virtual void paintEvent(QPaintEvent *ev);
 private:
--- branches/work/unity/WebKit/WebCore/platform/qt/FrameQt.cpp #561265:561266
@@ -52,6 +52,7 @@
 #include "KWQKSSLKeyGen.h"
 
 #include <QPaintEvent>
+#include <QScrollArea>
 
 DeprecatedStringList KSSLKeyGen::supportedKeySizes(){return \
DeprecatedStringList();};  DeprecatedString \
KSSLKeyGen::signedPublicKeyAndChallengeString(unsigned keySizeIndex, const \
DeprecatedString &challengeString, const KURL &url){return DeprecatedString();}; @@ \
-641,7 +642,7 @@  {
     qDebug("painting!!!");
     QRect clip = e->rect();
-    GraphicsContext* ctx = new GraphicsContext(view()->qwidget());
+    GraphicsContext* ctx = new \
GraphicsContext(qobject_cast<QScrollArea*>(view()->qwidget())->widget());  paint(ctx, \
clip);  delete ctx;
 }
--- branches/work/unity/WebKit/WebCore/platform/qt/ScrollViewQt.cpp #561265:561266
@@ -51,16 +51,20 @@
     qDebug("ScrollView::ScrollView()");
 
     if (1 ||isFrameView()) {
+#if 0
         foreach (QWidget *widget, QApplication::topLevelWidgets()) {
                 m_area = new QScrollArea(widget);
                 break;
         }
+#else
+        m_area = new QScrollArea(0);
+#endif
 
         //if(!m_area)
         //   m_area = new \
QScrollArea(static_cast<FrameQt*>(frame)->parentQObject());  
-        CanvasQt *canvas = new CanvasQt(this);
-        setQWidget(canvas);
+        CanvasQt *canvas = new CanvasQt(this, m_area);
+        setQWidget(m_area);
         m_area->setWidget(canvas);
 
         qDebug("set frameview widget");
--- branches/work/unity/WebKit/WebCore/platform/qt/test/testunity.cpp #561265:561266
@@ -63,6 +63,8 @@
     f->end();
 #endif
 
+    
+    toplevel->dumpObjectTree();
     app.exec();
     delete f;
     return 0;


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