Material style for Menu

Change-Id: Ifb00d1ddfc326cf206f6d1ffd93ccbe248eb5a3d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

5 files changed, 90 insertions, 6 deletions

diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index 02d817a8..c1b7d132 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -83,7 +83,7 @@ T.ComboBox {
             width: parent.width
             height: parent.height
             radius: 2
-            color: control.Material.comboBoxColor
+            color: control.Material.dialogColor
 
             Behavior on color {
                 ColorAnimation {
@@ -128,7 +128,7 @@ T.ComboBox {
                 id: panel
                 width: parent.width
                 height: parent.height
-                color: control.Material.comboBoxColor
+                color: control.Material.dialogColor
             }
 
             DropShadow {
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml
new file mode 100644
index 00000000..f60ab981
--- /dev/null
+++ b/src/imports/controls/material/Menu.qml
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Labs Controls module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import Qt.labs.controls 1.0
+import Qt.labs.templates 1.0 as T
+import Qt.labs.controls.material 1.0
+import QtGraphicalEffects 1.0
+
+T.Menu {
+    id: control
+
+    //! [contentItem]
+    contentItem: Item {
+        implicitWidth: 200
+        implicitHeight: Math.min(listview.contentHeight, 200)
+
+        Rectangle {
+            id: panel
+            width: parent.width
+            height: parent.height
+            color: control.Material.dialogColor
+        }
+
+        DropShadow {
+            source: panel
+            width: parent.width
+            height: parent.height
+            verticalOffset: 1
+            color: control.Material.dropShadowColor
+            samples: 15
+            spread: 0.5
+        }
+
+        ListView {
+            id: listview
+            width: parent.width
+            height: parent.height
+            model: control.contentModel
+            // TODO: improve this?
+            interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+            clip: true
+            keyNavigationWraps: false
+            currentIndex: -1
+
+            ScrollIndicator.vertical: ScrollIndicator {}
+        }
+    }
+    //! [contentItem]
+}
diff --git a/src/imports/controls/material/material.pri b/src/imports/controls/material/material.pri
index a1e99550..088905cc 100644
--- a/src/imports/controls/material/material.pri
+++ b/src/imports/controls/material/material.pri
@@ -20,6 +20,7 @@ QML_FILES += \
     $$PWD/GroupBox.qml \
     $$PWD/ItemDelegate.qml \
     $$PWD/Label.qml \
+    $$PWD/Menu.qml \
     $$PWD/Pane.qml \
     $$PWD/PageIndicator.qml \
     $$PWD/ProgressBar.qml \
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 191db14f..1d49341f 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -725,9 +725,9 @@ QColor QQuickMaterialStyle::drawerBackgroundColor() const
     return dividerTextColorLight;
 }
 
-QColor QQuickMaterialStyle::comboBoxColor() const
+QColor QQuickMaterialStyle::dialogColor() const
 {
-    return m_theme == Light ? "#ffffff" : backgroundColorDark;
+    return m_theme == Light ? dialogColorLight : dialogColorDark;
 }
 
 QColor QQuickMaterialStyle::backgroundDimColor() const
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 9bfb8176..de751473 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -92,7 +92,7 @@ class QQuickMaterialStyle : public QQuickStyle
     Q_PROPERTY(QColor scrollBarColor READ scrollBarColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor drawerBackgroundColor READ drawerBackgroundColor NOTIFY paletteChanged FINAL)
-    Q_PROPERTY(QColor comboBoxColor READ comboBoxColor NOTIFY paletteChanged FINAL)
+    Q_PROPERTY(QColor dialogColor READ dialogColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor backgroundDimColor READ backgroundDimColor NOTIFY paletteChanged FINAL)
 
 public:
@@ -201,7 +201,7 @@ public:
     QColor scrollBarColor() const;
     QColor scrollBarPressedColor() const;
     QColor drawerBackgroundColor() const;
-    QColor comboBoxColor() const;
+    QColor dialogColor() const;
     QColor backgroundDimColor() const;
 
     Q_INVOKABLE QColor color(Color color, Shade shade) const;