diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-06-18 11:38:40 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-06-25 13:51:16 +0000 |
| commit | 38f8d09676717035382629f877d2e68ce5c54b83 (patch) | |
| tree | 911008ee366fca4261ad1809efed97f723bdbe7a /src | |
| parent | 020b80eef2c3c1175d33fa24cf154c5de54c87d7 (diff) | |
Menu: fix items not being scrollable when using Window
Use Window.window instead of ApplicationWindow.window, as the former
will always result in a window regardless of which type of window is
in use.
Task-number: QTBUG-68858
Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/Menu.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Menu.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Menu.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/Menu.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/universal/Menu.qml | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index deadc274..0545b9a1 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -38,6 +38,7 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Controls.impl 2.4 import QtQuick.Templates 2.4 as T +import QtQuick.Window 2.11 T.Menu { id: control @@ -55,8 +56,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml index dc8e2eb2..3c9d98a2 100644 --- a/src/imports/controls/fusion/Menu.qml +++ b/src/imports/controls/fusion/Menu.qml @@ -40,6 +40,7 @@ import QtQuick.Controls 2.4 import QtQuick.Controls.impl 2.4 import QtQuick.Controls.Fusion 2.4 import QtQuick.Controls.Fusion.impl 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -58,8 +59,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml index 83953d05..74dc09de 100644 --- a/src/imports/controls/imagine/Menu.qml +++ b/src/imports/controls/imagine/Menu.qml @@ -39,6 +39,7 @@ import QtQuick.Controls 2.4 import QtQuick.Templates 2.4 as T import QtQuick.Controls.Imagine 2.4 import QtQuick.Controls.Imagine.impl 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -63,8 +64,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: T.ApplicationWindow.window ? contentHeight > T.ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 0f40380c..206ebd75 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -39,6 +39,7 @@ import QtQuick.Controls 2.4 import QtQuick.Templates 2.4 as T import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material.impl 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -74,8 +75,7 @@ T.Menu { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 36241f3a..ba998827 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -38,6 +38,7 @@ import QtQuick 2.11 import QtQuick.Controls 2.4 import QtQuick.Templates 2.4 as T import QtQuick.Controls.Universal 2.4 +import QtQuick.Window 2.11 T.Menu { id: control @@ -55,8 +56,7 @@ T.Menu { contentItem: ListView { implicitHeight: contentHeight model: control.contentModel - // TODO: improve this? - interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false + interactive: Window.window ? contentHeight > Window.window.height : false clip: true currentIndex: control.currentIndex |