Commit b0b997cd authored by Nate Graham's avatar Nate Graham
Browse files

Remove minor and unnecessary code differences between various toolbars

parent 32d36ad7
Pipeline #159296 passed with stage
in 3 minutes and 42 seconds
......@@ -47,17 +47,17 @@ Kirigami.Page {
manager: ElisaApplication.musicManager
}
// Header with title
// Header with title and actions
globalToolBarStyle: Kirigami.ApplicationHeaderStyle.None
header: ToolBar {
implicitHeight: Math.round(Kirigami.Units.gridUnit * 2.5)
Layout.fillWidth: true
// Override color to use standard window colors, not header colors
// TODO: remove this if the HeaderBar component is ever removed or moved
// to the bottom of the window such that this toolbar touches the window
// titlebar
Kirigami.Theme.colorSet: Kirigami.Theme.Window
RowLayout {
anchors.fill: parent
spacing: Kirigami.Units.smallSpacing
......@@ -323,8 +323,10 @@ Kirigami.Page {
footer: ToolBar {
implicitHeight: Math.round(Kirigami.Units.gridUnit * 2)
visible: !topItem.nothingPlaying
RowLayout {
anchors.fill: parent
spacing: Kirigami.Units.smallSpacing
LabelWithToolTip {
id: fileUrlLabel
......
......@@ -35,18 +35,21 @@ Kirigami.Page {
Accessible.role: Accessible.Pane
Accessible.name: topItem.title
// Header with title and actions
globalToolBarStyle: Kirigami.ApplicationHeaderStyle.None
header: ToolBar {
implicitHeight: Math.round(Kirigami.Units.gridUnit * 2.5)
leftPadding: Kirigami.Units.largeSpacing
// Override color to use standard window colors, not header colors
// TODO: remove this if the HeaderBar component is ever removed or moved
// to the bottom of the window such that this toolbar touches the window
// titlebar
Kirigami.Theme.colorSet: Kirigami.Theme.Window
implicitHeight: Math.round(Kirigami.Units.gridUnit * 2.5)
leftPadding: Kirigami.Units.largeSpacing
RowLayout {
anchors.fill: parent
spacing: Kirigami.Units.smallSpacing
Kirigami.Heading {
text: topItem.title
......@@ -377,10 +380,10 @@ Kirigami.Page {
footer: ToolBar {
implicitHeight: Math.round(Kirigami.Units.gridUnit * 2)
leftPadding: Kirigami.Units.largeSpacing
rightPadding: Kirigami.Units.largeSpacing
RowLayout {
anchors.fill: parent
spacing: Kirigami.Units.smallSpacing
LabelWithToolTip {
text: {
......
Supports Markdown
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