diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-26 01:54:04 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-26 04:15:47 (GMT) |
| commit | 93b02976b7c9c3a36cac475c1935622ebc2f1fe1 (patch) | |
| tree | 7c409125557585a15aa43fa9ce6badbb1bd7baaa /demos/declarative | |
| parent | 46340f1c5f8765276701a2831d6efd45607d8ff5 (diff) | |
| download | Qt-93b02976b7c9c3a36cac475c1935622ebc2f1fe1.zip Qt-93b02976b7c9c3a36cac475c1935622ebc2f1fe1.tar.gz Qt-93b02976b7c9c3a36cac475c1935622ebc2f1fe1.tar.bz2 | |
Test, demo, and work-around bug QTBUG-8535
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/webbrowser/content/FlickableWebView.qml | 1 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml | 45 |
2 files changed, 28 insertions, 18 deletions
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml index e686d02..76a5813 100644 --- a/demos/declarative/webbrowser/content/FlickableWebView.qml +++ b/demos/declarative/webbrowser/content/FlickableWebView.qml @@ -2,6 +2,7 @@ import Qt 4.6 Flickable { property alias title: webView.title + property alias icon: webView.icon property alias progress: webView.progress property alias url: webView.url property alias back: webView.back diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml index e8c9208..94c94f2 100644 --- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml +++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml @@ -13,31 +13,40 @@ Image { ? -webView.contentX+webView.contentWidth-webView.width : 0 y: webView.contentY < 0 ? -webView.contentY : progressOff* (webView.contentY>height?-height:-webView.contentY) - Text { - id: headerText + Row { + id: headerTitle - text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...' - elide: Text.ElideRight + anchors.top: header.top + anchors.topMargin: 4 + anchors.horizontalCenter: parent.horizontalCenter + spacing: 6 - color: "white" - styleColor: "black" - style: Text.Raised + Image { + id: headerIcon + pixmap: webView.icon + } - font.family: "Helvetica" - font.pointSize: 10 - font.bold: true + Text { + id: headerText - anchors.left: header.left - anchors.right: header.right - anchors.leftMargin: 4 - anchors.rightMargin: 4 - anchors.top: header.top - anchors.topMargin: 4 - horizontalAlignment: Text.AlignHCenter + text: webView.title!='' || webView.progress == 1.0 ? webView.title : 'Loading...' + elide: Text.ElideRight + //width: parent.width - headerIcon.width-4 + + color: "white" + styleColor: "black" + style: Text.Raised + + font.family: "Helvetica" + font.pointSize: 10 + font.bold: true + + horizontalAlignment: Text.AlignHCenter + } } Item { width: parent.width - anchors.top: headerText.bottom + anchors.top: headerTitle.bottom anchors.topMargin: 2 anchors.bottom: parent.bottom |