diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 20:40:54 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-06 21:41:33 +0200 |
commit | 026353c74a6343281045d42e717cd67e52aaf24c (patch) | |
tree | 1ad36ce6a7e57d10df808715981bf07c9a6462d6 /src/quicktemplates2/qquickpopup.cpp | |
parent | 0385c432962418431ec5fb4a80d57a5dd9926c6e (diff) | |
parent | 6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Fusion style ComboBox popup height was adjusted according to 90a0d402
to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass
with the Fusion style.
Conflicts:
src/imports/controls/ComboBox.qml
src/imports/controls/material/ComboBox.qml
src/imports/controls/universal/ComboBox.qml
Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
-rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 543a6f34..840b9f19 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE \section1 Popup Layout - The following diagram illustrates the layout of a typical popup: + The following diagram illustrates the layout of a popup within a window: \image qtquickcontrols2-popup.png @@ -304,7 +304,7 @@ bool QQuickPopupPrivate::acceptTouch(const QTouchEvent::TouchPoint &point) if (point.id() == touchId) return true; - if (touchId == -1 && point.state() == Qt::TouchPointPressed) { + if (touchId == -1 && point.state() != Qt::TouchPointReleased) { touchId = point.id(); return true; } @@ -986,12 +986,13 @@ void QQuickPopup::resetSpacing() /*! \qmlproperty real QtQuick.Controls::Popup::margins - This property holds the default margins around the popup. + This property holds the distance between the edges of the popup and the + edges of its window. A popup with negative margins is not pushed within the bounds of the enclosing window. The default value is \c -1. - \sa topMargin, leftMargin, rightMargin, bottomMargin + \sa topMargin, leftMargin, rightMargin, bottomMargin, {Popup Layout} */ qreal QQuickPopup::margins() const { @@ -1027,12 +1028,13 @@ void QQuickPopup::resetMargins() /*! \qmlproperty real QtQuick.Controls::Popup::topMargin - This property holds the top margin around the popup. + This property holds the distance between the top edge of the popup and + the top edge of its window. A popup with a negative top margin is not pushed within the top edge of the enclosing window. The default value is \c -1. - \sa margins, bottomMargin + \sa margins, bottomMargin, {Popup Layout} */ qreal QQuickPopup::topMargin() const { @@ -1057,12 +1059,13 @@ void QQuickPopup::resetTopMargin() /*! \qmlproperty real QtQuick.Controls::Popup::leftMargin - This property holds the left margin around the popup. + This property holds the distance between the left edge of the popup and + the left edge of its window. A popup with a negative left margin is not pushed within the left edge of the enclosing window. The default value is \c -1. - \sa margins, rightMargin + \sa margins, rightMargin, {Popup Layout} */ qreal QQuickPopup::leftMargin() const { @@ -1087,12 +1090,13 @@ void QQuickPopup::resetLeftMargin() /*! \qmlproperty real QtQuick.Controls::Popup::rightMargin - This property holds the right margin around the popup. + This property holds the distance between the right edge of the popup and + the right edge of its window. A popup with a negative right margin is not pushed within the right edge of the enclosing window. The default value is \c -1. - \sa margins, leftMargin + \sa margins, leftMargin, {Popup Layout} */ qreal QQuickPopup::rightMargin() const { @@ -1117,12 +1121,13 @@ void QQuickPopup::resetRightMargin() /*! \qmlproperty real QtQuick.Controls::Popup::bottomMargin - This property holds the bottom margin around the popup. + This property holds the distance between the bottom edge of the popup and + the bottom edge of its window. A popup with a negative bottom margin is not pushed within the bottom edge of the enclosing window. The default value is \c -1. - \sa margins, topMargin + \sa margins, topMargin, {Popup Layout} */ qreal QQuickPopup::bottomMargin() const { |