From 18624d2d4602e5ac6466ee815a9c34bbf6061de1 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 29 Feb 2016 16:44:44 +0100 Subject: Purge sRGB chunks from PNGs in documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I40e902a2ddff05684ff90b178728c562c2cd8cd1 Reviewed-by: Topi Reiniö --- .../qtlabscontrols-applicationwindow-wireframe.png | Bin 5283 -> 1795 bytes .../doc/images/qtlabscontrols-page-wireframe.png | Bin 5283 -> 1795 bytes .../doc/images/qtlabscontrols-universal-button.png | Bin 2172 -> 674 bytes .../doc/images/qtlabscontrols-universal-dark.png | Bin 5450 -> 2894 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src') diff --git a/src/imports/controls/doc/images/qtlabscontrols-applicationwindow-wireframe.png b/src/imports/controls/doc/images/qtlabscontrols-applicationwindow-wireframe.png index d45ae400..f612c243 100644 Binary files a/src/imports/controls/doc/images/qtlabscontrols-applicationwindow-wireframe.png and b/src/imports/controls/doc/images/qtlabscontrols-applicationwindow-wireframe.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-page-wireframe.png b/src/imports/controls/doc/images/qtlabscontrols-page-wireframe.png index d45ae400..f612c243 100644 Binary files a/src/imports/controls/doc/images/qtlabscontrols-page-wireframe.png and b/src/imports/controls/doc/images/qtlabscontrols-page-wireframe.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-universal-button.png b/src/imports/controls/doc/images/qtlabscontrols-universal-button.png index 6ddec823..6c764ec9 100644 Binary files a/src/imports/controls/doc/images/qtlabscontrols-universal-button.png and b/src/imports/controls/doc/images/qtlabscontrols-universal-button.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png b/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png index 98701550..ec459457 100644 Binary files a/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png and b/src/imports/controls/doc/images/qtlabscontrols-universal-dark.png differ -- cgit v1.2.3 From c59c43bbc44026a508746b1de2505f6185bd0310 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 23 Mar 2016 10:44:08 +0100 Subject: ComboBox: fix usage in an asynchronous Loader The following comment in QQmlDelegateModel::object() helped to find a solution ie. using createdItem() instead of initItem(): If asynchronous is true or the component is being loaded asynchronously due to an ancestor being loaded asynchronously, item() may return 0. In this case createdItem() will be emitted when the item is available. [...] Change-Id: If3bf8e60834534ca07c8db8f502f4f11969057e8 Task-number: QTBUG-51972 Reviewed-by: Mitch Curtis --- src/templates/qquickcombobox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp index e37b0f52..fb9f6d4d 100644 --- a/src/templates/qquickcombobox.cpp +++ b/src/templates/qquickcombobox.cpp @@ -165,7 +165,7 @@ public: void itemClicked(); - void initItem(int index, QObject *object); + void createdItem(int index, QObject *object); void countChanged(); void updateCurrentText(); void increase(); @@ -235,7 +235,7 @@ void QQuickComboBoxPrivate::itemClicked() } } -void QQuickComboBoxPrivate::initItem(int index, QObject *object) +void QQuickComboBoxPrivate::createdItem(int index, QObject *object) { QQuickAbstractButton *button = qobject_cast(object); if (button) @@ -316,7 +316,7 @@ void QQuickComboBoxPrivate::createDelegateModel() if (oldModel) { disconnect(delegateModel, &QQmlInstanceModel::countChanged, this, &QQuickComboBoxPrivate::countChanged); disconnect(delegateModel, &QQmlInstanceModel::modelUpdated, this, &QQuickComboBoxPrivate::updateCurrentText); - disconnect(delegateModel, &QQmlInstanceModel::initItem, this, &QQuickComboBoxPrivate::initItem); + disconnect(delegateModel, &QQmlInstanceModel::createdItem, this, &QQuickComboBoxPrivate::createdItem); } ownModel = false; @@ -336,7 +336,7 @@ void QQuickComboBoxPrivate::createDelegateModel() if (delegateModel) { connect(delegateModel, &QQmlInstanceModel::countChanged, this, &QQuickComboBoxPrivate::countChanged); connect(delegateModel, &QQmlInstanceModel::modelUpdated, this, &QQuickComboBoxPrivate::updateCurrentText); - connect(delegateModel, &QQmlInstanceModel::initItem, this, &QQuickComboBoxPrivate::initItem); + connect(delegateModel, &QQmlInstanceModel::createdItem, this, &QQuickComboBoxPrivate::createdItem); } emit q->delegateModelChanged(); -- cgit v1.2.3 From bed6b3d633d83302a8e2167845db4b36e6847f0b Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Wed, 30 Mar 2016 10:46:59 +0300 Subject: Fix ScrollBars with paddings Padding was not taken into account when calculating the new position, which caused there to be small offset between the mouse press and the resulting handle position by the amount of padding used. Task-number: QTBUG-52233 Change-Id: Ibd8c4375b030a27a6124aefc4bc9af570d14d3a9 Reviewed-by: Mitch Curtis --- src/imports/controls/ScrollBar.qml | 4 ++-- src/imports/controls/material/ScrollBar.qml | 4 ++-- src/imports/controls/universal/ScrollBar.qml | 4 ++-- src/templates/qquickscrollbar.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index 55d53191..b9ebd634 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -60,8 +60,8 @@ T.ScrollBar { opacity: 0.0 readonly property bool horizontal: control.orientation === Qt.Horizontal - x: control.leftPadding + (horizontal ? control.position * control.width : 0) - y: control.topPadding + (horizontal ? 0 : control.position * control.height) + x: control.leftPadding + (horizontal ? control.position * control.availableWidth : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.availableHeight) width: horizontal ? control.size * control.availableWidth : implicitWidth height: horizontal ? implicitHeight : control.size * control.availableHeight diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 539b9243..72130c63 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -60,8 +60,8 @@ T.ScrollBar { opacity: 0.0 readonly property bool horizontal: control.orientation === Qt.Horizontal - x: control.leftPadding + (horizontal ? control.position * control.width : 0) - y: control.topPadding + (horizontal ? 0 : control.position * control.height) + x: control.leftPadding + (horizontal ? control.position * control.availableWidth : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.availableHeight) width: horizontal ? control.size * control.availableWidth : implicitWidth height: horizontal ? implicitHeight : control.size * control.availableHeight diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index b1bc8f6a..dd0a81ca 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -58,8 +58,8 @@ T.ScrollBar { opacity: 0.0 readonly property bool horizontal: control.orientation === Qt.Horizontal - x: control.leftPadding + (horizontal ? control.position * control.width : 0) - y: control.topPadding + (horizontal ? 0 : control.position * control.height) + x: control.leftPadding + (horizontal ? control.position * control.availableWidth : 0) + y: control.topPadding + (horizontal ? 0 : control.position * control.availableHeight) width: horizontal ? control.size * control.availableWidth : implicitWidth height: horizontal ? implicitHeight : control.size * control.availableHeight } diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index 86d4e290..b3679bf8 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -285,9 +285,9 @@ qreal QQuickScrollBar::positionAt(const QPoint &point) const { Q_D(const QQuickScrollBar); if (d->orientation == Qt::Horizontal) - return point.x() / width(); + return (point.x() - leftPadding()) / availableWidth(); else - return point.y() / height(); + return (point.y() - topPadding()) / availableHeight(); } #ifndef QT_NO_ACCESSIBILITY -- cgit v1.2.3 From 87cbcbf9972321f26fa47ded04005f30bb2a279d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 9 Apr 2016 20:37:03 +0200 Subject: Doc: fix ButtonGroup::buttons type Change-Id: Id78ef819c56d4639c33e7b4823c2c2600486befa Reviewed-by: Mitch Curtis --- src/templates/qquickbuttongroup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/templates/qquickbuttongroup.cpp b/src/templates/qquickbuttongroup.cpp index 0865277e..2cbb5ece 100644 --- a/src/templates/qquickbuttongroup.cpp +++ b/src/templates/qquickbuttongroup.cpp @@ -232,7 +232,7 @@ void QQuickButtonGroup::setCheckedButton(QQuickAbstractButton *checkedButton) } /*! - \qmlproperty list Qt.labs.controls::ButtonGroup::buttons + \qmlproperty list Qt.labs.controls::ButtonGroup::buttons \default This property holds the list of buttons. -- cgit v1.2.3