Fix kf6 globaldrawer loading issue

This commit is contained in:
Bart De Vries 2023-04-25 14:35:09 +02:00
parent ef627c047e
commit e20509f621
1 changed files with 24 additions and 20 deletions

View File

@ -124,31 +124,35 @@ Kirigami.ApplicationWindow {
} }
} }
globalDrawer: sidebar.item property bool showGlobalDrawer: !Kirigami.Settings.isMobile || kastsMainWindow.isWidescreen
Loader {
id: sidebar
active: !Kirigami.Settings.isMobile || kastsMainWindow.isWidescreen
sourceComponent: Kirigami.OverlayDrawer {
id: drawer
modal: false
closePolicy: Controls.Popup.NoAutoClose
edge: Qt.application.layoutDirection === Qt.RightToLeft ? Qt.RightEdge : Qt.LeftEdge
readonly property real pinnedWidth: Kirigami.Units.gridUnit * 3 globalDrawer: showGlobalDrawer ? myGlobalDrawer : null
readonly property real widescreenBigWidth: Kirigami.Units.gridUnit * 10
readonly property int buttonDisplayMode: kastsMainWindow.isWidescreen ? Kirigami.NavigationTabButton.TextBesideIcon : Kirigami.NavigationTabButton.IconOnly
width: kastsMainWindow.isWidescreen ? widescreenBigWidth : pinnedWidth property Kirigami.OverlayDrawer myGlobalDrawer: Kirigami.OverlayDrawer {
id: drawer
modal: false
closePolicy: Controls.Popup.NoAutoClose
edge: Qt.application.layoutDirection === Qt.RightToLeft ? Qt.RightEdge : Qt.LeftEdge
Kirigami.Theme.colorSet: Kirigami.Theme.Window readonly property real pinnedWidth: Kirigami.Units.gridUnit * 3
Kirigami.Theme.inherit: false readonly property real widescreenBigWidth: Kirigami.Units.gridUnit * 10
readonly property int buttonDisplayMode: kastsMainWindow.isWidescreen ? Kirigami.NavigationTabButton.TextBesideIcon : Kirigami.NavigationTabButton.IconOnly
leftPadding: 0 width: showGlobalDrawer ? (kastsMainWindow.isWidescreen ? widescreenBigWidth : pinnedWidth) : 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: ColumnLayout { Kirigami.Theme.colorSet: Kirigami.Theme.Window
Kirigami.Theme.inherit: false
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: Loader {
id: sidebarColumn
active: showGlobalDrawer
sourceComponent: ColumnLayout {
spacing: 0 spacing: 0
Controls.ToolBar { Controls.ToolBar {