diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-08 14:26:51 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-09 19:26:18 +0000 |
| commit | 3a5bd3d4e564a1b3cd56ed2cfb5258e4ded763b6 (patch) | |
| tree | caf02741b70b3a1c44277e74fc9ce7d1aa924620 /src/imports/controls/universal | |
| parent | d1d3438f59a96f2263076d41d82a99e7269b4159 (diff) | |
Rename Panel to Popup
Popup is a more descriptive name. Furthermore, this name change opens
the door for another type called Pane. It gives the appropriate
background color for the current style & theme.
Change-Id: Idb91d37e807f62e870b50f0b656e84ee2d43a9fb
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 0fdcb894..9b47d76a 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -86,9 +86,9 @@ T.ComboBox { border.width: 2 // ComboBoxBorderThemeThickness border.color: !control.enabled ? control.Universal.baseLowColor : - control.pressed || panel.visible ? control.Universal.baseMediumLowColor : control.Universal.baseMediumLowColor + control.pressed || popup.visible ? control.Universal.baseMediumLowColor : control.Universal.baseMediumLowColor color: !control.enabled ? control.Universal.baseLowColor : - control.pressed || panel.visible ? control.Universal.listMediumColor : control.Universal.altMediumLowColor + control.pressed || popup.visible ? control.Universal.listMediumColor : control.Universal.altMediumLowColor Rectangle { x: 2 @@ -110,11 +110,10 @@ T.ComboBox { } //! [background] - //! [panel] - panel: T.Panel { - id: popup + //! [popup] + popup: T.Popup { contentItem: Rectangle { - // TODO: Panel::anchors + // TODO: Popup::anchors readonly property var above: popup.visible ? control.mapToItem(null, 0, control.height - height) : Qt.point(0, 0) readonly property var below: popup.visible ? control.mapToItem(null, 0, 0) : Qt.point(0, 0) @@ -138,5 +137,5 @@ T.ComboBox { } } } - //! [panel] + //! [popup] } |