diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:49:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 12:13:19 +0000 |
| commit | 76b2908700d84e31d94cee7099d22af453a4f00d (patch) | |
| tree | 52074124a1deed71619a7630b92cbeb1809f4a4b /src/imports | |
| parent | 4f1fb09ed70c69e73f2e19f28f4299f4cfbc90dc (diff) | |
Add Popup::transformOrigin
Change-Id: I4a52468234f0479c1b8feb102e07686e3235ba3f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-popup-transformorigin.png | bin | 0 -> 8927 bytes | |||
| -rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/Menu.qml | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/controls/doc/images/qtlabscontrols-popup-transformorigin.png b/src/imports/controls/doc/images/qtlabscontrols-popup-transformorigin.png Binary files differnew file mode 100644 index 00000000..4af320fb --- /dev/null +++ b/src/imports/controls/doc/images/qtlabscontrols-popup-transformorigin.png diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index b19901fb..2d1e2899 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -117,6 +117,7 @@ T.ComboBox { y: control.height implicitWidth: control.width implicitHeight: Math.min(200, listview.contentHeight) + transformOrigin: Item.Top enter: Transition { // grow_fade_in @@ -135,7 +136,6 @@ T.ComboBox { clip: true model: control.delegateModel currentIndex: control.highlightedIndex - transformOrigin: popup.showAbove ? Item.Bottom : Item.Top // ScrollIndicator.vertical: ScrollIndicator { } } diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 6a5c6f61..6dc645a9 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -48,6 +48,8 @@ T.Menu { implicitHeight: Math.min(background ? background.implicitHeight : 0, contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + transformOrigin: Item.Top + enter: Transition { // grow_fade_in NumberAnimation { property: "scale"; from: 0.9; to: 1.0; easing.type: Easing.OutQuint; duration: 220 } @@ -63,7 +65,6 @@ T.Menu { //! [contentItem] contentItem: ListView { implicitHeight: contentHeight - transformOrigin: Item.Top model: control.contentModel // TODO: improve this? |
