diff --git a/sidebar/package/contents/ui/CategoriesPage.qml b/sidebar/package/contents/ui/CategoriesPage.qml --- a/sidebar/package/contents/ui/CategoriesPage.qml +++ b/sidebar/package/contents/ui/CategoriesPage.qml @@ -27,7 +27,8 @@ id: mainColumn Component.onCompleted: searchField.forceActiveFocus() - header: Item { + header: Rectangle { + color: Kirigami.Theme.backgroundColor width: mainColumn.width height: searchLayout.implicitHeight + Kirigami.Units.smallSpacing * 2 RowLayout { diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml --- a/sidebar/package/contents/ui/SubCategoryPage.qml +++ b/sidebar/package/contents/ui/SubCategoryPage.qml @@ -25,47 +25,52 @@ Kirigami.ScrollablePage { id: subCategoryColumn - header: MouseArea { - width: subCategoryColumn.width - height: topLayout.implicitHeight + Kirigami.Units.smallSpacing * 2 - enabled: !applicationWindow().wideScreen - cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor - onClicked: root.pageStack.currentIndex = 0; - Accessible.role: Accessible.Button - Accessible.name: i18n("Back") - RowLayout { - id: topLayout - height: backButton.height - spacing: Kirigami.Units.smallSpacing - anchors { - fill: parent - margins: Kirigami.Units.smallSpacing - leftMargin: backButton.visible ? Kirigami.Units.smallSpacing : Kirigami.Units.smallSpacing * 2 - } - QtControls.ToolButton { - id: backButton - Layout.maximumWidth: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2 - Layout.maximumHeight: width - visible: !applicationWindow().wideScreen - iconName: "go-previous" - onClicked: root.pageStack.currentIndex = 0; - } - Kirigami.Label { - Layout.fillWidth: true - Layout.minimumHeight: Layout.maximumHeight - Layout.maximumHeight: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2 - text: subCategoryColumn.title - elide: Text.ElideRight - opacity: 0.3 - //FIXME: kirigami bug, why? - Component.onCompleted: font.bold = true + header: Rectangle { + height: mouseArea.height + color: Kirigami.Theme.backgroundColor + MouseArea { + id: mouseArea + width: subCategoryColumn.width + height: topLayout.implicitHeight + Kirigami.Units.smallSpacing * 2 + enabled: !applicationWindow().wideScreen + cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor + onClicked: root.pageStack.currentIndex = 0; + Accessible.role: Accessible.Button + Accessible.name: i18n("Back") + RowLayout { + id: topLayout + height: backButton.height + spacing: Kirigami.Units.smallSpacing + anchors { + fill: parent + margins: Kirigami.Units.smallSpacing + leftMargin: backButton.visible ? Kirigami.Units.smallSpacing : Kirigami.Units.smallSpacing * 2 + } + QtControls.ToolButton { + id: backButton + Layout.maximumWidth: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2 + Layout.maximumHeight: width + visible: !applicationWindow().wideScreen + iconName: "go-previous" + onClicked: root.pageStack.currentIndex = 0; + } + Kirigami.Label { + Layout.fillWidth: true + Layout.minimumHeight: Layout.maximumHeight + Layout.maximumHeight: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2 + text: subCategoryColumn.title + elide: Text.ElideRight + opacity: 0.3 + //FIXME: kirigami bug, why? + Component.onCompleted: font.bold = true + } } - } - Kirigami.Separator { - anchors { - left: parent.left - right: parent.right - top: parent.bottom + Kirigami.Separator { + anchors { + left: parent.left + right: parent.right + top: parent.bottom + } } } }