aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/imports/controls/ToolTip.qml2
-rw-r--r--src/imports/controls/material/ToolTip.qml2
-rw-r--r--src/imports/controls/universal/ToolTip.qml2
-rw-r--r--src/quicktemplates2/qquickcombobox.cpp2
-rw-r--r--src/quicktemplates2/qquickdrawer.cpp2
-rw-r--r--src/quicktemplates2/qquickmenu.cpp2
-rw-r--r--src/quicktemplates2/qquickpopup.cpp22
-rw-r--r--src/quicktemplates2/qquickpopup_p.h10
-rw-r--r--tests/auto/popup/tst_popup.cpp22
9 files changed, 33 insertions, 33 deletions
diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml
index c36172b4..6a16e068 100644
--- a/src/imports/controls/ToolTip.qml
+++ b/src/imports/controls/ToolTip.qml
@@ -51,7 +51,7 @@ T.ToolTip {
padding: 6
- closePolicy: T.Popup.OnEscape | T.Popup.OnPressOutsideParent | T.Popup.OnReleaseOutsideParent
+ closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
//! [contentItem]
contentItem: Text {
diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml
index ba49350f..263f1766 100644
--- a/src/imports/controls/material/ToolTip.qml
+++ b/src/imports/controls/material/ToolTip.qml
@@ -54,7 +54,7 @@ T.ToolTip {
rightPadding: 16
bottomPadding: 8
- closePolicy: T.Popup.OnEscape | T.Popup.OnPressOutsideParent | T.Popup.OnReleaseOutsideParent
+ closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
Material.theme: Material.Dark
diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml
index 3fec669f..4703e6b7 100644
--- a/src/imports/controls/universal/ToolTip.qml
+++ b/src/imports/controls/universal/ToolTip.qml
@@ -54,7 +54,7 @@ T.ToolTip {
rightPadding: 8
bottomPadding: 7
- closePolicy: T.Popup.OnEscape | T.Popup.OnPressOutsideParent | T.Popup.OnReleaseOutsideParent
+ closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent
//! [contentItem]
contentItem: Text {
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index 766cabe8..61ce5ce6 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -623,7 +623,7 @@ void QQuickComboBox::setPopup(QQuickPopup *popup)
delete d->popup;
if (popup)
- popup->setClosePolicy(QQuickPopup::OnEscape | QQuickPopup::OnPressOutsideParent);
+ popup->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent);
d->popup = popup;
emit popupChanged();
}
diff --git a/src/quicktemplates2/qquickdrawer.cpp b/src/quicktemplates2/qquickdrawer.cpp
index 615396e7..1ebdc035 100644
--- a/src/quicktemplates2/qquickdrawer.cpp
+++ b/src/quicktemplates2/qquickdrawer.cpp
@@ -329,7 +329,7 @@ QQuickDrawer::QQuickDrawer(QObject *parent) :
setFocus(true);
setModal(true);
setFiltersChildMouseEvents(true);
- setClosePolicy(OnEscape | OnReleaseOutside);
+ setClosePolicy(CloseOnEscape | CloseOnReleaseOutside);
}
/*!
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp
index 8c3d9168..b3716bf9 100644
--- a/src/quicktemplates2/qquickmenu.cpp
+++ b/src/quicktemplates2/qquickmenu.cpp
@@ -266,7 +266,7 @@ QQuickMenu::QQuickMenu(QObject *parent) :
QQuickPopup(*(new QQuickMenuPrivate), parent)
{
setFocus(true);
- setClosePolicy(OnEscape | OnPressOutside | OnReleaseOutside);
+ setClosePolicy(CloseOnEscape | CloseOnPressOutside | CloseOnReleaseOutside);
}
/*!
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
index 04bee8a3..da9d5fe0 100644
--- a/src/quicktemplates2/qquickpopup.cpp
+++ b/src/quicktemplates2/qquickpopup.cpp
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
height: 300
modal: true
focus: true
- closePolicy: Popup.OnEscape | Popup.OnPressOutsideParent
+ closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
}
}
\endqml
@@ -136,7 +136,7 @@ QQuickPopupPrivate::QQuickPopupPrivate()
, bottomMargin(0)
, contentWidth(0)
, contentHeight(0)
- , closePolicy(QQuickPopup::OnEscape | QQuickPopup::OnPressOutside)
+ , closePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutside)
, parentItem(nullptr)
, enter(nullptr)
, exit(nullptr)
@@ -158,8 +158,8 @@ bool QQuickPopupPrivate::tryClose(QQuickItem *item, QMouseEvent *event)
{
Q_Q(QQuickPopup);
const bool isPress = event->type() == QEvent::MouseButtonPress;
- const bool onOutside = closePolicy.testFlag(isPress ? QQuickPopup::OnPressOutside : QQuickPopup::OnReleaseOutside);
- const bool onOutsideParent = closePolicy.testFlag(isPress ? QQuickPopup::OnPressOutsideParent : QQuickPopup::OnReleaseOutsideParent);
+ const bool onOutside = closePolicy.testFlag(isPress ? QQuickPopup::CloseOnPressOutside : QQuickPopup::CloseOnReleaseOutside);
+ const bool onOutsideParent = closePolicy.testFlag(isPress ? QQuickPopup::CloseOnPressOutsideParent : QQuickPopup::CloseOnReleaseOutsideParent);
if (onOutside || onOutsideParent) {
if (!popupItem->contains(item->mapToItem(popupItem, event->pos()))) {
if (!onOutsideParent || !parentItem || !parentItem->contains(item->mapToItem(parentItem, event->pos()))) {
@@ -1552,14 +1552,14 @@ void QQuickPopup::setScale(qreal scale)
The available values are:
\value Popup.NoAutoClose The popup will only close when manually instructed to do so.
- \value Popup.OnPressOutside The popup will close when the mouse is pressed outside of it.
- \value Popup.OnPressOutsideParent The popup will close when the mouse is pressed outside of its parent.
- \value Popup.OnReleaseOutside The popup will close when the mouse is released outside of it.
- \value Popup.OnReleaseOutsideParent The popup will close when the mouse is released outside of its parent.
- \value Popup.OnEscape The popup will close when the escape key is pressed while the popup
+ \value Popup.CloseOnPressOutside The popup will close when the mouse is pressed outside of it.
+ \value Popup.CloseOnPressOutsideParent The popup will close when the mouse is pressed outside of its parent.
+ \value Popup.CloseOnReleaseOutside The popup will close when the mouse is released outside of it.
+ \value Popup.CloseOnReleaseOutsideParent The popup will close when the mouse is released outside of its parent.
+ \value Popup.CloseOnEscape The popup will close when the escape key is pressed while the popup
has active focus.
- The default value is \c {Popup.OnEscape | Popup.OnPressOutside}.
+ The default value is \c {Popup.CloseOnEscape | Popup.CloseOnPressOutside}.
*/
QQuickPopup::ClosePolicy QQuickPopup::closePolicy() const
{
@@ -1709,7 +1709,7 @@ void QQuickPopup::keyPressEvent(QKeyEvent *event)
if (event->key() != Qt::Key_Escape)
return;
- if (d->closePolicy.testFlag(OnEscape))
+ if (d->closePolicy.testFlag(CloseOnEscape))
close();
}
diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h
index 8a586c96..e1219a2c 100644
--- a/src/quicktemplates2/qquickpopup_p.h
+++ b/src/quicktemplates2/qquickpopup_p.h
@@ -238,11 +238,11 @@ public:
enum ClosePolicyFlag {
NoAutoClose = 0x00,
- OnPressOutside = 0x01,
- OnPressOutsideParent = 0x02,
- OnReleaseOutside = 0x04,
- OnReleaseOutsideParent = 0x08,
- OnEscape = 0x10
+ CloseOnPressOutside = 0x01,
+ CloseOnPressOutsideParent = 0x02,
+ CloseOnReleaseOutside = 0x04,
+ CloseOnReleaseOutsideParent = 0x08,
+ CloseOnEscape = 0x10
};
Q_DECLARE_FLAGS(ClosePolicy, ClosePolicyFlag)
Q_FLAG(ClosePolicy)
diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp
index ef29ac1b..9ae08d93 100644
--- a/tests/auto/popup/tst_popup.cpp
+++ b/tests/auto/popup/tst_popup.cpp
@@ -141,12 +141,12 @@ void tst_popup::closePolicy_data()
QTest::addColumn<QQuickPopup::ClosePolicy>("closePolicy");
QTest::newRow("NoAutoClose") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::NoAutoClose);
- QTest::newRow("OnPressOutside") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::OnPressOutside);
- QTest::newRow("OnPressOutsideParent") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::OnPressOutsideParent);
- QTest::newRow("OnPressOutside|Parent") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::OnPressOutside | QQuickPopup::OnPressOutsideParent);
- QTest::newRow("OnReleaseOutside") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::OnReleaseOutside);
- QTest::newRow("OnReleaseOutside|Parent") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::OnReleaseOutside | QQuickPopup::OnReleaseOutsideParent);
- QTest::newRow("OnEscape") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::OnEscape);
+ QTest::newRow("CloseOnPressOutside") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnPressOutside);
+ QTest::newRow("CloseOnPressOutsideParent") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnPressOutsideParent);
+ QTest::newRow("CloseOnPressOutside|Parent") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnPressOutside | QQuickPopup::CloseOnPressOutsideParent);
+ QTest::newRow("CloseOnReleaseOutside") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnReleaseOutside);
+ QTest::newRow("CloseOnReleaseOutside|Parent") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnReleaseOutside | QQuickPopup::CloseOnReleaseOutsideParent);
+ QTest::newRow("CloseOnEscape") << static_cast<QQuickPopup::ClosePolicy>(QQuickPopup::CloseOnEscape);
}
void tst_popup::closePolicy()
@@ -175,7 +175,7 @@ void tst_popup::closePolicy()
// press outside popup and its parent
QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
- if (closePolicy.testFlag(QQuickPopup::OnPressOutside) || closePolicy.testFlag(QQuickPopup::OnPressOutsideParent))
+ if (closePolicy.testFlag(QQuickPopup::CloseOnPressOutside) || closePolicy.testFlag(QQuickPopup::CloseOnPressOutsideParent))
QVERIFY(!popup->isVisible());
else
QVERIFY(popup->isVisible());
@@ -185,7 +185,7 @@ void tst_popup::closePolicy()
// release outside popup and its parent
QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(1, 1));
- if (closePolicy.testFlag(QQuickPopup::OnReleaseOutside))
+ if (closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutside))
QVERIFY(!popup->isVisible());
else
QVERIFY(popup->isVisible());
@@ -195,7 +195,7 @@ void tst_popup::closePolicy()
// press outside popup but inside its parent
QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x(), button->y()));
- if (closePolicy.testFlag(QQuickPopup::OnPressOutside) && !closePolicy.testFlag(QQuickPopup::OnPressOutsideParent))
+ if (closePolicy.testFlag(QQuickPopup::CloseOnPressOutside) && !closePolicy.testFlag(QQuickPopup::CloseOnPressOutsideParent))
QVERIFY(!popup->isVisible());
else
QVERIFY(popup->isVisible());
@@ -205,7 +205,7 @@ void tst_popup::closePolicy()
// release outside popup but inside its parent
QTest::mouseRelease(window, Qt::LeftButton, Qt::NoModifier, QPoint(button->x(), button->y()));
- if (closePolicy.testFlag(QQuickPopup::OnReleaseOutside) && !closePolicy.testFlag(QQuickPopup::OnReleaseOutsideParent))
+ if (closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutside) && !closePolicy.testFlag(QQuickPopup::CloseOnReleaseOutsideParent))
QVERIFY(!popup->isVisible());
else
QVERIFY(popup->isVisible());
@@ -215,7 +215,7 @@ void tst_popup::closePolicy()
// escape
QTest::keyClick(window, Qt::Key_Escape);
- if (closePolicy.testFlag(QQuickPopup::OnEscape))
+ if (closePolicy.testFlag(QQuickPopup::CloseOnEscape))
QVERIFY(!popup->isVisible());
else
QVERIFY(popup->isVisible());
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 14:09:45 +0000