qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Popup: expose flip API" 

This reverts commit 09706e8f9f.

It was a bit rushed to expose the allow*Flip properties. We have now
added several other similar internal allowFooBar flags, so clearly
a more sustainable solution is to craft some kind of horizontal and
vertical sizing/positioning policies out of them. So, remove this
unreleased API while we still can, so we don't have to deprecate it
right away.

Conflicts:
	src/imports/templates/qtquicktemplates2plugin.cpp

Change-Id: Iea33c11805071499b472b18426bbdc8d871a4a58
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
J-P Nurmi 2016-09-22 08:58:37 +02:00
parent ab91c57135
commit f1eef22d0d
6 changed files with 4 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/imports/templates/qtquicktemplates2plugin.cpp
View File

@ -185,7 +185,6 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 1, "DialogButtonBox");
qmlRegisterType<QQuickDialogButtonBoxAttached>();
qmlRegisterType<QQuickMenuSeparator>(uri, 2, 1, "MenuSeparator");
qmlRegisterType<QQuickPopup, 1>(uri, 2, 1, "Popup");
qmlRegisterType<QQuickRangeSlider, 1>(uri, 2, 1, "RangeSlider");
qmlRegisterType<QQuickRoundButton, 1>(uri, 2, 1, "RoundButton");
qmlRegisterType<QQuickSlider, 1>(uri, 2, 1, "Slider");

2
src/quicktemplates2/qquickcombobox.cpp
View File

@ -688,7 +688,7 @@ void QQuickComboBox::setPopup(QQuickPopup *popup)
d->deleteDelegate(d->popup);
if (popup) {
popup->setAllowVerticalFlip(true);
QQuickPopupPrivate::get(popup)->allowVerticalFlip = true;
popup->setClosePolicy(QQuickPopup::CloseOnEscape | QQuickPopup::CloseOnPressOutsideParent);
}
d->popup = popup;

58
src/quicktemplates2/qquickpopup.cpp
View File

@ -1385,64 +1385,6 @@ void QQuickPopup::resetBottomPadding()
d->popupItem->resetBottomPadding();
}
/*!
\since QtQuick.Controls 2.1
\qmlproperty bool QtQuick.Controls::Popup::allowVerticalFlip
This property holds whether the popup is allowed to flip vertically.
A popup can be flipped from above its parent item to below it, or vice
versa, in order to make the popup fit inside the window.
The default value is \c false.
\sa allowHorizontalFlip
*/
bool QQuickPopup::allowVerticalFlip() const
{
Q_D(const QQuickPopup);
return d->allowVerticalFlip;
}
void QQuickPopup::setAllowVerticalFlip(bool allow)
{
Q_D(QQuickPopup);
if (d->allowVerticalFlip == allow)
return;
d->allowVerticalFlip = allow;
emit allowVerticalFlipChanged();
}
/*!
\since QtQuick.Controls 2.1
\qmlproperty bool QtQuick.Controls::Popup::allowHorizontalFlip
This property holds whether the popup is allowed to flip horizontally.
A popup can be flipped from the left side of its parent item to the right
side, or vice versa, in order to make the popup fit inside the window.
The default value is \c false.
\sa allowVerticalFlip
*/
bool QQuickPopup::allowHorizontalFlip() const
{
Q_D(const QQuickPopup);
return d->allowHorizontalFlip;
}
void QQuickPopup::setAllowHorizontalFlip(bool allow)
{
Q_D(QQuickPopup);
if (d->allowHorizontalFlip == allow)
return;
d->allowHorizontalFlip = allow;
emit allowHorizontalFlipChanged();
}
/*!
\qmlproperty Locale QtQuick.Controls::Popup::locale

10
src/quicktemplates2/qquickpopup_p.h
View File

@ -94,8 +94,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQml
Q_PROPERTY(qreal leftPadding READ leftPadding WRITE setLeftPadding RESET resetLeftPadding NOTIFY leftPaddingChanged FINAL)
Q_PROPERTY(qreal rightPadding READ rightPadding WRITE setRightPadding RESET resetRightPadding NOTIFY rightPaddingChanged FINAL)
Q_PROPERTY(qreal bottomPadding READ bottomPadding WRITE setBottomPadding RESET resetBottomPadding NOTIFY bottomPaddingChanged FINAL)
Q_PROPERTY(bool allowVerticalFlip READ allowVerticalFlip WRITE setAllowVerticalFlip NOTIFY allowVerticalFlipChanged FINAL REVISION 1)
Q_PROPERTY(bool allowHorizontalFlip READ allowHorizontalFlip WRITE setAllowHorizontalFlip NOTIFY allowHorizontalFlipChanged FINAL REVISION 1)
Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL)
Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
Q_PROPERTY(QQuickItem *parent READ parentItem WRITE setParentItem NOTIFY parentChanged FINAL)
@ -196,12 +194,6 @@ public:
void setBottomPadding(qreal padding);
void resetBottomPadding();
bool allowVerticalFlip() const;
void setAllowVerticalFlip(bool allow);
bool allowHorizontalFlip() const;
void setAllowHorizontalFlip(bool allow);
QLocale locale() const;
void setLocale(const QLocale &locale);
void resetLocale();
@ -311,8 +303,6 @@ Q_SIGNALS:
void leftPaddingChanged();
void rightPaddingChanged();
void bottomPaddingChanged();
Q_REVISION(1) void allowVerticalFlipChanged();
Q_REVISION(1) void allowHorizontalFlipChanged();
void fontChanged();
void localeChanged();
void parentChanged();

5
src/quicktemplates2/qquicktooltip.cpp
View File

@ -163,8 +163,9 @@ void QQuickToolTipPrivate::stopTimeout()
QQuickToolTip::QQuickToolTip(QQuickItem *parent) :
QQuickPopup(*(new QQuickToolTipPrivate), parent)
{
setAllowVerticalFlip(true);
setAllowHorizontalFlip(true);
Q_D(QQuickToolTip);
d->allowVerticalFlip = true;
d->allowHorizontalFlip = true;
}
/*!

35
tests/auto/controls/data/tst_popup.qml
View File

@ -485,41 +485,6 @@ TestCase {
control.destroy()
}
function test_flip_data() {
return [
{tag: "flip top-bottom", parentX: 0, parentY: 0, popupX: 0, popupY: -50, popupItemX: 0, popupItemY: 50, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "flip bottom-top", parentX: 0, parentY: 300, popupX: 0, popupY: 50, popupItemX: 0, popupItemY: 250, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "flip left-right", parentX: 0, parentY: 0, popupX: -50, popupY: 0, popupItemX: 50, popupItemY: 0, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "flip right-left", parentX: 300, parentY: 0, popupX: 50, popupY: 0, popupItemX: 250, popupItemY: 0, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "no flip top-bottom", parentX: 0, parentY: 50, popupX: 0, popupY: -50, popupItemX: 0, popupItemY: 0, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "no flip bottom-top", parentX: 0, parentY: 250, popupX: 0, popupY: 50, popupItemX: 0, popupItemY: 300, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "no flip left-right", parentX: 50, parentY: 0, popupX: -50, popupY: 0, popupItemX: 0, popupItemY: 0, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "no flip right-left", parentX: 250, parentY: 0, popupX: 50, popupY: 0, popupItemX: 300, popupItemY: 0, allowVerticalFlip: true, allowHorizontalFlip: true },
{tag: "disallow flip top-bottom", parentX: 0, parentY: 0, popupX: 0, popupY: -50, popupItemX: 0, popupItemY: -50, allowVerticalFlip: false, allowHorizontalFlip: false },
{tag: "disallow flip bottom-top", parentX: 0, parentY: 300, popupX: 0, popupY: 50, popupItemX: 0, popupItemY: 350, allowVerticalFlip: false, allowHorizontalFlip: false },
{tag: "disallow flip left-right", parentX: 0, parentY: 0, popupX: -50, popupY: 0, popupItemX: -50, popupItemY: 0, allowVerticalFlip: false, allowHorizontalFlip: false },
{tag: "disallow flip right-left", parentX: 300, parentY: 0, popupX: 50, popupY: 0, popupItemX: 350, popupItemY: 0, allowVerticalFlip: false, allowHorizontalFlip: false }
]
}
function test_flip(data) {
var parentItem = rect.createObject(testCase, {color: "red", x: data.parentX, y: data.parentY, width: 100, height: 100})
verify(parentItem)
var control = popupControl.createObject(parentItem, {x: data.popupX, y: data.popupY, width: 100, height: 100, allowVerticalFlip: data.allowVerticalFlip, allowHorizontalFlip: data.allowHorizontalFlip})
verify(control)
control.open()
verify(control.visible)
compare(control.contentItem.parent.y, data.popupItemY)
compare(control.contentItem.parent.x, data.popupItemX)
parentItem.destroy()
}
function test_background() {
var control = popupTemplate.createObject(testCase)
verify(control)