From 40b3ee57e385ca636f90c59604fa4f3692a08edc Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 8 Jun 2016 14:00:14 +0200 Subject: ScrollView: block updates when redoing the layout Changing the contentHeight might change the maximum value of the scrollbar which might change the value of the scrollbar which, if blockUpdates is not set, will change the contentY of the flickable. This can cause flickering when contentHeight varries with contentY which might typically happen for a ListView where not all elements have the same height. Or worse, this can make the scrolling jump and result in the wrong position. Change-Id: I1968055492d679387ebbf6813a160efbf82e4fbb Reviewed-by: Gabriel de Dietrich --- src/controls/Private/ScrollViewHelper.qml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 03ca30c8..b4a589bf 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -70,10 +70,12 @@ Item { function doLayout() { if (!recursionGuard) { recursionGuard = true + blockUpdates = true; scrollHelper.contentWidth = flickableItem !== null ? flickableItem.contentWidth : 0 scrollHelper.contentHeight = flickableItem !== null ? flickableItem.contentHeight : 0 scrollHelper.availableWidth = viewport.width scrollHelper.availableHeight = viewport.height + blockUpdates = false; recursionGuard = false } } -- cgit v1.2.1 From 85c29330678dc5d8e51b006f51cc39706ab1abab Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 19 May 2016 14:37:46 +0200 Subject: Doc: Fix documentation warnings src/controls/doc/src/qtquickcontrols-examples.qdoc:90: warning: Unable to parse QML snippet: "Expected token `{'" at line 1, column 10 src/controls/doc/src/qtquickcontrols-examples.qdoc:116: warning: Unable to parse QML snippet: "Expected a qualified name id" at line 1, column 1 src/controls/doc/src/qtquickcontrols-tableview.qdoc:299: warning: Unrecognizable QML module/component qualifier for TableView::section src/controls/doc/src/qtquickcontrols-treeview.qdoc:138: warning: Unrecognizable QML module/component qualifier for TreeView::section (multiple) warning: Can't link to 'DropShadow' Change-Id: Ic5e2dcbe9810486290e164f561ecba969f57df78 Reviewed-by: Venugopal Shivashankar --- src/controls/doc/qtquickcontrols.qdocconf | 2 +- src/controls/doc/src/qtquickcontrols-examples.qdoc | 8 ++++---- src/controls/doc/src/qtquickcontrols-tableview.qdoc | 4 ++-- src/controls/doc/src/qtquickcontrols-treeview.qdoc | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index 9aada9f6..e81777e0 100644 --- a/src/controls/doc/qtquickcontrols.qdocconf +++ b/src/controls/doc/qtquickcontrols.qdocconf @@ -34,7 +34,7 @@ qhp.QtQuickControls.subprojects.qqcexamples.indexTitle = Qt Quick Controls Examp qhp.QtQuickControls.subprojects.qqcexamples.selectors = doc:example group:stylingtutorials qhp.QtQuickControls.subprojects.qqcexamples.sortpages = true -depends = qtcore qtdoc qtgui qtwidgets qtqml qtquick qtquicklayouts qtquickdialogs qtquickextras +depends = qtcore qtdoc qtgui qtwidgets qtqml qtquick qtquicklayouts qtquickdialogs qtquickextras qtgraphicaleffects # Specify the install path under QT_INSTALL_EXAMPLES # Examples will be installed under quick/controls - 'controls' subdirectory diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index bc82349e..7ad34a30 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -83,16 +83,16 @@ In all forms, items that are supposed to interact with the application logic are exported: - \qml + \code property alias cancel: cancel property alias save: save property alias textArea: textArea - \endqml + \endcode This is the way the items are exported in \e NotesForm.ui.qml, so they can be used in \e Notes.ui.qml to implement the logic as follows: - \qml + \code function readData() { CustomerModel.selection.forEach(function (rowIndex) { form.textArea.text = CustomerModel.model.get(rowIndex).notes @@ -113,7 +113,7 @@ cancel.onClicked: readData() save.onClicked: writeData() - \endqml + \endcode \section1 Implementing the Backend in a Singleton diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc index 48546e5b..e188ac9e 100644 --- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc @@ -288,12 +288,12 @@ */ /*! - \qmlpropertygroup TableView::section + \qmlpropertygroup QtQuick.Controls::TableView::section \qmlproperty string TableView::section.property \qmlproperty enumeration TableView::section.criteria \qmlproperty Component TableView::section.delegate \qmlproperty enumeration TableView::section.labelPositioning These properties determine the section labels. - \sa ListView::section + \sa {QtQuick::ListView::section}{ListView.section} */ diff --git a/src/controls/doc/src/qtquickcontrols-treeview.qdoc b/src/controls/doc/src/qtquickcontrols-treeview.qdoc index bcfbad7b..b5ea0051 100644 --- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc @@ -125,14 +125,15 @@ */ /*! - \qmlpropertygroup TreeView::section + \qmlpropertygroup QtQuick.Controls::TreeView::section \qmlproperty string TreeView::section.property \qmlproperty enumeration TreeView::section.criteria \qmlproperty Component TreeView::section.delegate \qmlproperty enumeration TreeView::section.labelPositioning These properties determine the section labels. - \sa ListView::section + + \sa {QtQuick::ListView::section}{ListView.section} */ /*! -- cgit v1.2.1 From d0d169c1eae8824c679f8a5fbba47e2413cf7a52 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 20 Jun 2016 17:38:09 +0200 Subject: fix tooltip usage Change-Id: I305659b22f680eea903bf2e02a2998b9f71f5f5f Reviewed-by: Tim Jenssen --- src/extras/designer/PictureSpecifics.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/extras/designer/PictureSpecifics.qml b/src/extras/designer/PictureSpecifics.qml index 538614e4..55248ecd 100644 --- a/src/extras/designer/PictureSpecifics.qml +++ b/src/extras/designer/PictureSpecifics.qml @@ -52,7 +52,7 @@ Column { SectionLayout { Label { text: qsTr("Source") - toolTip: qsTr("Source") + tooltip: qsTr("Source") } SecondColumnLayout { LineEdit { -- cgit v1.2.1