diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-22 12:10:12 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-22 14:09:23 +0000 |
| commit | 7427e2808324388678eefda45b3e83c675979290 (patch) | |
| tree | 2fe0308a0c84d8fd55ff1a3664565b2f5536dd6b /src/imports/controls/Popup.qml | |
| parent | 482ecb0fdc011687eec3df5803653be88f14f539 (diff) | |
Refactor Popup
Added relevant properties to make it almost like a Control: x, y,
width, height, padding, background... This change makes popup use
an internal item where the style/user-supplied contentItem and
background are re-parented. This way we can provide a default style
(background) for Popup.
Change-Id: I3e7933562464c5c852e4ba4bc37d9ac25691c714
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Popup.qml')
| -rw-r--r-- | src/imports/controls/Popup.qml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml index b7c6fe08..3d3fb365 100644 --- a/src/imports/controls/Popup.qml +++ b/src/imports/controls/Popup.qml @@ -39,4 +39,15 @@ import Qt.labs.templates 1.0 as T T.Popup { id: control + + width: Math.max(background ? background.implicitWidth : 0, + contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + height: Math.max(background ? background.implicitHeight : 0, + contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + + padding: 6 + + background: Rectangle { + border.color: "#353637" + } } |