aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickpopup_p_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-04-23 20:26:35 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-04-25 03:48:09 +0000
commit99fa43b3708d6615e17d0cc5561aca78a9c72d1a (patch)
treea8891fc183b5da10eb53d14184d9c789f51d49fc /src/quicktemplates2/qquickpopup_p_p.h
parentdd0a29bb332b8ed0acfdf72ab2072be3bbd84006 (diff)
Promote QQuickToolTip's repositioning code to QQuickPopup
QQuickToolTip already had repositioning implemented for both horizontal and vertical directions. Promote that code up to QQuickPopup so that QQuickMenu gets properly repositioned when used as a context menu. As special cases, QQuickComboBox enables vertical flipping for its popup, and QQuickToolTip enables both. In the QQuickPopup base class, both are disabled by default. Task-number: QTBUG-52608 Change-Id: Ia8f835321222d4841a6f79434822b33f057d13fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/quicktemplates2/qquickpopup_p_p.h')
-rw-r--r--src/quicktemplates2/qquickpopup_p_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 4e123170..a765998a 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -182,6 +182,8 @@ public:
bool hasLeftMargin;
bool hasRightMargin;
bool hasBottomMargin;
+ bool allowVerticalFlip;
+ bool allowHorizontalFlip;
qreal x;
qreal y;
qreal margins;