Remove banner properties from GlobalDrawer

The banner image was drop in the design of our apps a while ago, today is not used anymore, remove the api for kf6 related issue: https://invent.kde.org/frameworks/kirigami/-/issues/64
KDE · Oct 4, 2023 · 41bdddb · 41bdddb
1 parent ab82ee0
commit 41bdddb
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 85 deletions.
diff --git a/Mainpage.dox b/Mainpage.dox
@@ -70,8 +70,6 @@ Kirigami.ApplicationWindow {
     height: 400
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
         actions: [
             Kirigami.Action {
                 text: "View"

diff --git a/examples/applicationitemapp/main.qml b/examples/applicationitemapp/main.qml
@@ -11,9 +11,6 @@ Kirigami.ApplicationItem {
     id: root
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
-
         actions: [
             Kirigami.Action {
                 text: "View"

diff --git a/examples/simpleexamples/AbstractApplicationWindow.qml b/examples/simpleexamples/AbstractApplicationWindow.qml
@@ -19,7 +19,6 @@ Kirigami.AbstractApplicationWindow {
     globalDrawer: Kirigami.GlobalDrawer {
         title: "Widget gallery"
         titleIcon: "applications-graphics"
-
         actions: [
             Kirigami.Action {
                 text: "View"

diff --git a/examples/simpleexamples/footer.qml b/examples/simpleexamples/footer.qml
@@ -21,9 +21,6 @@ Kirigami.ApplicationWindow {
         }
     }
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
-
         actions: [
             Kirigami.Action {
                 text: "View"

diff --git a/examples/simpleexamples/layerOverDrawer.qml b/examples/simpleexamples/layerOverDrawer.qml
@@ -18,8 +18,6 @@ Kirigami.ApplicationWindow {
 
     Kirigami.GlobalDrawer {
         id: drawer
-        title: "Hello App"
-        titleIcon: "applications-graphics"
         modal: false
 
         actions: [

diff --git a/examples/simpleexamples/minimal.qml b/examples/simpleexamples/minimal.qml
@@ -11,9 +11,6 @@ Kirigami.ApplicationWindow {
     id: root
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
-
         actions: [
             Kirigami.Action {
                 text: "View"

diff --git a/examples/simpleexamples/pagePoolDrawer.qml b/examples/simpleexamples/pagePoolDrawer.qml
@@ -15,8 +15,6 @@ Kirigami.ApplicationWindow {
     }
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
         modal: !root.wideScreen
         width: Kirigami.Units.gridUnit * 10
 

diff --git a/examples/simpleexamples/pagePoolFirstColumn.qml b/examples/simpleexamples/pagePoolFirstColumn.qml
@@ -15,8 +15,6 @@ Kirigami.ApplicationWindow {
     }
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
     }
     contextDrawer: Kirigami.ContextDrawer {
         id: contextDrawer

diff --git a/examples/simpleexamples/pushpopclear.qml b/examples/simpleexamples/pushpopclear.qml
@@ -12,9 +12,6 @@ Kirigami.ApplicationWindow {
     id: root
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
-
         actions: [
             Kirigami.Action {
                 text: "push"

diff --git a/examples/simpleexamples/simpleChatApp.qml b/examples/simpleexamples/simpleChatApp.qml
@@ -19,8 +19,6 @@ Kirigami.ApplicationWindow {
 
     globalDrawer: Kirigami.GlobalDrawer {
         contentItem.implicitWidth: columnWidth
-        title: "Chat App"
-        titleIcon: "konversation"
         modal: true
         drawerOpen: false
         isMenu: true

diff --git a/examples/staticcmake/src/main.qml b/examples/staticcmake/src/main.qml
@@ -15,8 +15,6 @@ Kirigami.ApplicationWindow {
     pageStack.initialPage: Page1 {}
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: "Hello App"
-        titleIcon: "applications-graphics"
         actions: [
             Kirigami.Action {
                 text: "View"

diff --git a/src/controls/GlobalDrawer.qml b/src/controls/GlobalDrawer.qml
@@ -63,22 +63,15 @@ OverlayDrawer {
      * @see org::kde::kirigami::private::BannerImage::title
      * @property string title
      */
-    property alias title: bannerImage.title
+    property string title
 
     /**
      * @brief This property holds an icon to be displayed alongside the title.
      * @see org::kde::kirigami::private::BannerImage::titleIcon
      * @see org::kde::kirigami::Icon::source
      * @property var titleIcon
      */
-    property alias titleIcon: bannerImage.titleIcon
-
-    /**
-     * @brief This property holds the banner image source.
-     * @see org::kde::kirigami::ShadowedImage::source
-     * @property url bannerImageSource
-     */
-    property alias bannerImageSource: bannerImage.source
+    property var titleIcon
 
     /**
      * @brief This property holds the actions displayed in the drawer.
@@ -128,19 +121,15 @@ OverlayDrawer {
      * @note This property is mainly intended for toolbars.
      * @since 2.12
      */
-    property Item header
-
-    /**
-     * @brief This property sets drawers banner visibility.
-     *
-     * If true, the banner area (which can contain an image,
-     * an icon, and a title) will be visible.
-     *
-     * default: `the banner will be visible only on mobile platforms`
-     *
-     * @since 2.12
-     */
-    property bool bannerVisible: Kirigami.Settings.isMobile
+    property Item header: RowLayout {
+        visible: root.title.length > 0 || root.titleIcon
+        Kirigami.Icon {
+            source: root.titleIcon
+        }
+        Kirigami.Heading {
+            text: root.title
+        }
+    }
 
     /**
      * @brief This property holds items that are displayed above the actions.
@@ -256,11 +245,6 @@ OverlayDrawer {
     property bool collapseButtonVisible: true
 //END properties
 
-    /**
-     * @brief This signal notifies that the banner has been clicked.
-     */
-    signal bannerClicked()
-
     /**
      * @brief This function reverts the menu back to its initial state
      */
@@ -275,6 +259,9 @@ OverlayDrawer {
 
     Kirigami.Theme.colorSet: modal ? Kirigami.Theme.Window : Kirigami.Theme.View
 
+    Component.onCompleted: {
+        headerChanged()
+    }
     onHeaderChanged: {
         if (header) {
             header.parent = headerContainer
@@ -320,40 +307,9 @@ OverlayDrawer {
                     rightMargin: Math.min(0, -scrollView.width + mainFlickable.width)
                 }
                 spacing: 0
-                y: bannerImage.visible ? Math.max(headerContainer.height, -mainFlickable.contentY) - height : 0
 
                 Layout.fillWidth: true
-                // visible: !bannerImage.empty || root.collapsible
-
-                P.BannerImage {
-                    id: bannerImage
-
 
-                    visible: !bannerImage.empty && opacity > 0 && root.bannerVisible
-                    opacity: !root.collapsed
-                    fillMode: Image.PreserveAspectCrop
-
-                    Behavior on opacity {
-                        OpacityAnimator {
-                            duration: Kirigami.Units.longDuration
-                            easing.type: Easing.InOutQuad
-                        }
-                    }
-                    // leftPadding: root.collapsible ? collapseButton.width + Kirigami.Units.smallSpacing*2 : topPadding
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked: mouse => root.bannerClicked()
-                    }
-                    P.EdgeShadow {
-                        edge: Qt.BottomEdge
-                        visible: bannerImageSource != ""
-                        anchors {
-                            left: parent.left
-                            right: parent.right
-                            bottom: parent.top
-                        }
-                    }
-                }
                 RowLayout {
                     id: headerContainer
                     Kirigami.Theme.inherit: false

diff --git a/templates/kirigami6/src/contents/ui/main.qml b/templates/kirigami6/src/contents/ui/main.qml
@@ -37,8 +37,6 @@ Kirigami.ApplicationWindow {
     property int counter: 0
 
     globalDrawer: Kirigami.GlobalDrawer {
-        title: i18n("%{APPNAME}")
-        titleIcon: "applications-graphics"
         isMenu: !Kirigami.Settings.isMobile
         actions: [
             Kirigami.Action {