diff options
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/controls/ComboBox.qml | 11 | ||||
-rw-r--r-- | src/imports/controls/doc/images/qtlabscontrols-combobox-popup.png (renamed from src/imports/controls/doc/images/qtlabscontrols-combobox-panel.png) | bin | 4969 -> 4969 bytes | |||
-rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-combobox-popup.qml (renamed from src/imports/controls/doc/snippets/qtlabscontrols-combobox-panel.qml) | 8 | ||||
-rw-r--r-- | src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml | 6 | ||||
-rw-r--r-- | src/imports/controls/doc/src/qtlabscontrols-customize.qdoc | 10 | ||||
-rw-r--r-- | src/imports/controls/material/ComboBox.qml | 9 | ||||
-rw-r--r-- | src/imports/controls/universal/ComboBox.qml | 13 | ||||
-rw-r--r-- | src/imports/templates/qtlabstemplatesplugin.cpp | 4 |
9 files changed, 32 insertions, 35 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 7f2adcb0..3d4e5ed5 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -85,7 +85,7 @@ T.ComboBox { width: parent.width height: parent.height opacity: control.enabled ? 1.0 : 0.2 - color: control.pressed || panel.visible ? "#585A5C" : "#353637" + color: control.pressed || popup.visible ? "#585A5C" : "#353637" } Image { @@ -96,11 +96,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, -height + 1) : Qt.point(0, 0) readonly property var below: popup.visible ? control.mapToItem(null, 0, control.height - 1) : Qt.point(0, 0) @@ -129,5 +128,5 @@ T.ComboBox { } } } - //! [panel] + //! [popup] } diff --git a/src/imports/controls/doc/images/qtlabscontrols-combobox-panel.png b/src/imports/controls/doc/images/qtlabscontrols-combobox-popup.png Binary files differindex 0e9eacbf..0e9eacbf 100644 --- a/src/imports/controls/doc/images/qtlabscontrols-combobox-panel.png +++ b/src/imports/controls/doc/images/qtlabscontrols-combobox-popup.png diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml index 47c4f606..60f56940 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-delegate.qml @@ -31,12 +31,12 @@ import Qt.labs.controls 1.0 Item { id: root width: combo.width - height: combo.height + combo.panel.contentItem.height + height: combo.height + combo.popup.contentItem.height ComboBox { id: combo model: ["First", "Second", "Third"] - panel.contentItem.parent: root - panel.contentItem.y: combo.height + popup.contentItem.parent: root + popup.contentItem.y: combo.height delegate: ItemDelegate { width: combo.width text: modelData diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-panel.qml b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-popup.qml index d1788d55..0fea67d1 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-combobox-panel.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-combobox-popup.qml @@ -31,15 +31,15 @@ import Qt.labs.controls 1.0 Item { id: root width: combo.width - height: combo.height + combo.panel.contentItem.height + height: combo.height + combo.popup.contentItem.height ComboBox { id: combo model: ["First", "Second", "Third"] - panel.contentItem.parent: root - panel.contentItem.y: combo.height + popup.contentItem.parent: root + popup.contentItem.y: combo.height } Rectangle { - parent: combo.panel.contentItem + parent: combo.popup.contentItem anchors.fill: parent color: 'transparent' border.color: 'red' diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml b/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml index bac6136d..4d7fe7fd 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-combobox.qml @@ -31,13 +31,13 @@ import Qt.labs.controls 1.0 Item { id: root width: combo.width - height: combo.height + combo.panel.contentItem.height + height: combo.height + combo.popup.contentItem.height //! [1] ComboBox { id: combo model: ["First", "Second", "Third"] - panel.contentItem.parent: root - panel.contentItem.y: combo.height + popup.contentItem.parent: root + popup.contentItem.y: combo.height } //! [1] } diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc index eb1dc71d..524cd23a 100644 --- a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -99,7 +99,7 @@ \section1 Customizing ComboBox ComboBox consists of \l {Control::background}{background}, - \l {Control::contentItem}{content item}, \l {ComboBox::panel}{panel}, + \l {Control::contentItem}{content item}, \l {ComboBox::popup}{popup}, and \l {ComboBox::delegate}{delegate}. \section3 Background @@ -114,11 +114,11 @@ \snippet ComboBox.qml contentItem - \section3 Panel + \section3 Popup - \image qtlabscontrols-combobox-panel.png + \image qtlabscontrols-combobox-popup.png - \snippet ComboBox.qml panel + \snippet ComboBox.qml popup \section3 Delegate @@ -240,7 +240,7 @@ \section1 Customizing Menu - Menu consists of a \l {Panel::}{contentItem}. + Menu consists of a \l {Popup::}{contentItem}. \section3 Content item diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 035863f6..13bbdf38 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -109,11 +109,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, -height) : Qt.point(0, 0) readonly property var below: popup.visible ? control.mapToItem(null, 0, control.height) : Qt.point(0, 0) @@ -150,5 +149,5 @@ T.ComboBox { } } } - //! [panel] + //! [popup] } 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] } diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtlabstemplatesplugin.cpp index 5e4877f8..44a08fb3 100644 --- a/src/imports/templates/qtlabstemplatesplugin.cpp +++ b/src/imports/templates/qtlabstemplatesplugin.cpp @@ -53,7 +53,7 @@ #include <QtLabsTemplates/private/qquickmenu_p.h> #include <QtLabsTemplates/private/qquickmenuitem_p.h> #include <QtLabsTemplates/private/qquickpageindicator_p.h> -#include <QtLabsTemplates/private/qquickpanel_p.h> +#include <QtLabsTemplates/private/qquickpopup_p.h> #include <QtLabsTemplates/private/qquickprogressbar_p.h> #include <QtLabsTemplates/private/qquickradiobutton_p.h> #include <QtLabsTemplates/private/qquickrangeslider_p.h> @@ -103,7 +103,7 @@ void QtLabsTemplatesPlugin::registerTypes(const char *uri) qmlRegisterType<QQuickMenu>(uri, 1, 0, "Menu"); qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem"); qmlRegisterType<QQuickPageIndicator>(uri, 1, 0, "PageIndicator"); - qmlRegisterType<QQuickPanel>(uri, 1, 0, "Panel"); + qmlRegisterType<QQuickPopup>(uri, 1, 0, "Popup"); qmlRegisterType<QQuickProgressBar>(uri, 1, 0, "ProgressBar"); qmlRegisterType<QQuickRadioButton>(uri, 1, 0, "RadioButton"); qmlRegisterType<QQuickRangeSlider>(uri, 1, 0, "RangeSlider"); |