Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d5f7c102 authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

Adapt to new syntax for the header

Fixes weird behavior on the Kirigami header

BUG: 395455
parent cde88d11
......@@ -19,7 +19,7 @@ include(GenerateExportHeader)
find_package(PkgConfig REQUIRED)
find_package(KF5 5.45 REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO)
find_package(KF5 5.48 REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO)
find_package(KF5Kirigami2 2.1.0)
find_package(packagekitqt5 CONFIG)
......
......@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Controls 2.1
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kirigami 2.2 as Kirigami
import org.kde.kirigami 2.5 as Kirigami
import "navigation.js" as Navigation
Kirigami.ApplicationWindow
......@@ -27,14 +27,6 @@ Kirigami.ApplicationWindow
objectName: "DiscoverMainWindow"
title: leftPage ? leftPage.title : ""
ConditionalObject {
id: whichToolbar
condition: window.wideScreen
componentTrue: Component { id: desktopHeader; Kirigami.ToolBarApplicationHeader {} }
componentFalse: Component { id: mobileHeader; Kirigami.ApplicationHeader {} }
}
header: whichToolbar.object
visible: true
......@@ -42,6 +34,7 @@ Kirigami.ApplicationWindow
minimumHeight: 300
pageStack.defaultColumnWidth: Kirigami.Units.gridUnit * 25
pageStack.globalToolBar.style: window.wideScreen ? Kirigami.ApplicationHeaderStyle.ToolBar : Kirigami.ApplicationHeaderStyle.Breadcrumb
readonly property var leftPage: window.stack.depth>0 ? window.stack.get(0) : null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment