diff options
Diffstat (limited to 'src/imports/controls/Menu.qml')
-rw-r--r-- | src/imports/controls/Menu.qml | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index dc428629..cb9f693d 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ -import QtQuick 2.9 -import QtQuick.Controls 2.2 -import QtQuick.Controls.impl 2.2 -import QtQuick.Templates 2.2 as T +import QtQuick 2.10 +import QtQuick.Controls 2.3 +import QtQuick.Controls.impl 2.3 +import QtQuick.Templates 2.3 as T T.Menu { id: control @@ -48,6 +48,9 @@ T.Menu { contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 + overlap: 1 + + delegate: MenuItem { } contentItem: ListView { implicitHeight: contentHeight @@ -55,8 +58,7 @@ T.Menu { // TODO: improve this? interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false clip: true - keyNavigationWraps: false - currentIndex: -1 + currentIndex: control.currentIndex ScrollIndicator.vertical: ScrollIndicator {} } @@ -64,7 +66,15 @@ T.Menu { background: Rectangle { implicitWidth: 200 implicitHeight: 40 - color: Default.backgroundColor - border.color: Default.frameDarkColor + color: control.palette.window + border.color: control.palette.dark + } + + T.Overlay.modal: Rectangle { + color: Color.transparent(control.palette.shadow, 0.5) + } + + T.Overlay.modeless: Rectangle { + color: Color.transparent(control.palette.shadow, 0.12) } } |