diff options
-rw-r--r-- | demos/declarative/webbrowser/content/pics/footer.sci | 6 | ||||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/softshadow-bottom.png | bin | 153 -> 186 bytes | |||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/softshadow-left.png | bin | 349 -> 598 bytes | |||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/softshadow-right.png | bin | 390 -> 636 bytes | |||
-rw-r--r-- | demos/declarative/webbrowser/content/pics/softshadow-top.png | bin | 137 -> 186 bytes | |||
-rw-r--r-- | src/declarative/fx/qfxitem.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/qfxview.cpp | 10 | ||||
-rw-r--r-- | src/declarative/util/qfxview.h | 1 |
8 files changed, 11 insertions, 8 deletions
diff --git a/demos/declarative/webbrowser/content/pics/footer.sci b/demos/declarative/webbrowser/content/pics/footer.sci deleted file mode 100644 index de0ed04..0000000 --- a/demos/declarative/webbrowser/content/pics/footer.sci +++ /dev/null @@ -1,6 +0,0 @@ -gridLeft: 10 -gridTop: 0 -gridBottom: 0 -gridRight: 10 -imageFile: footer.png - diff --git a/demos/declarative/webbrowser/content/pics/softshadow-bottom.png b/demos/declarative/webbrowser/content/pics/softshadow-bottom.png Binary files differindex 59c1ba1..85b0b44 100644 --- a/demos/declarative/webbrowser/content/pics/softshadow-bottom.png +++ b/demos/declarative/webbrowser/content/pics/softshadow-bottom.png diff --git a/demos/declarative/webbrowser/content/pics/softshadow-left.png b/demos/declarative/webbrowser/content/pics/softshadow-left.png Binary files differindex d08f5c7..02926d1 100644 --- a/demos/declarative/webbrowser/content/pics/softshadow-left.png +++ b/demos/declarative/webbrowser/content/pics/softshadow-left.png diff --git a/demos/declarative/webbrowser/content/pics/softshadow-right.png b/demos/declarative/webbrowser/content/pics/softshadow-right.png Binary files differindex 1bb29d5..e459f4f 100644 --- a/demos/declarative/webbrowser/content/pics/softshadow-right.png +++ b/demos/declarative/webbrowser/content/pics/softshadow-right.png diff --git a/demos/declarative/webbrowser/content/pics/softshadow-top.png b/demos/declarative/webbrowser/content/pics/softshadow-top.png Binary files differindex ef86738..9a9e232 100644 --- a/demos/declarative/webbrowser/content/pics/softshadow-top.png +++ b/demos/declarative/webbrowser/content/pics/softshadow-top.png diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 9131256..6b4c504 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -1658,7 +1658,7 @@ void QFxItem::classBegin() void QFxItem::classComplete() { #ifdef Q_ENABLE_PERFORMANCE_LOG - QFxPerfTimer<QFxPerf::ItemClassComplete> cc; + QFxPerfTimer<QFxPerf::ItemComponentComplete> cc; #endif Q_D(QFxItem); d->_classComplete = true; diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp index a8b8eea..993d5cb 100644 --- a/src/declarative/util/qfxview.cpp +++ b/src/declarative/util/qfxview.cpp @@ -228,7 +228,9 @@ void QFxView::continueExecute() QPerformanceLog::displayData(); QPerformanceLog::clear(); d->root = item; - emit sceneResized(QSize(item->width(), item->height())); + connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged())); + connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged())); + sizeChanged(); } else if(QWidget *wid = qobject_cast<QWidget *>(obj)) { window()->setAttribute(Qt::WA_OpaquePaintEvent, false); window()->setAttribute(Qt::WA_NoSystemBackground, false); @@ -246,6 +248,12 @@ void QFxView::continueExecute() } } +void QFxView::sizeChanged() +{ + if (d->root) + emit sceneResized(QSize(d->root->width(),d->root->height())); +} + QFxItem* QFxView::addItem(const QString &xml, QFxItem* parent) { if(!d->root) diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h index b5592b8..3c4be20 100644 --- a/src/declarative/util/qfxview.h +++ b/src/declarative/util/qfxview.h @@ -89,6 +89,7 @@ Q_SIGNALS: private Q_SLOTS: void continueExecute(); + void sizeChanged(); protected: virtual void resizeEvent(QResizeEvent *); |