Merge branch 'Plasma/5.17'

This commit is contained in:
Filip Fila 2019-11-28 19:40:35 +01:00
commit 0ece47afa8

View file

@ -46,16 +46,16 @@ Kirigami.Page {
// out of https://bugs.kde.org/show_bug.cgi?id=394296 // out of https://bugs.kde.org/show_bug.cgi?id=394296
ColumnLayout { ColumnLayout {
id: tabLayout id: tabLayout
// Tab styles generally assume that they're touching the inner layout,
// not the frame, so we need to move the tab bar down a pixel and make
// sure it's drawn on top of the frame
Layout.bottomMargin: -1
z: 1
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
Controls.TabBar { Controls.TabBar {
id: tabBar id: tabBar
// Tab styles generally assume that they're touching the inner layout,
// not the frame, so we need to move the tab bar down a pixel and make
// sure it's drawn on top of the frame
z: 1
Layout.bottomMargin: -1
Layout.fillWidth: true Layout.fillWidth: true
Controls.TabButton { Controls.TabButton {