controlcenter: fix edge to edge in panels
This commit is contained in:
parent
266cffe342
commit
f79fd9328c
6 changed files with 46 additions and 38 deletions
|
|
@ -114,8 +114,7 @@ RowLayout {
|
||||||
id: sidebarFlickable
|
id: sidebarFlickable
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: sidebarLayout.implicitHeight + Appearance.padding.large * 2
|
contentHeight: sidebarLayout.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: sidebarFlickable
|
flickable: sidebarFlickable
|
||||||
|
|
@ -852,11 +851,12 @@ RowLayout {
|
||||||
|
|
||||||
StyledFlickable {
|
StyledFlickable {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Appearance.padding.large * 2
|
anchors.margins: Appearance.padding.normal
|
||||||
|
anchors.leftMargin: 0
|
||||||
|
anchors.rightMargin: Appearance.padding.normal / 2
|
||||||
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: contentLayout.implicitHeight
|
contentHeight: contentLayout.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: parent
|
flickable: parent
|
||||||
|
|
@ -868,6 +868,8 @@ RowLayout {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.leftMargin: Appearance.padding.large * 2
|
||||||
|
anchors.rightMargin: Appearance.padding.large * 2
|
||||||
|
|
||||||
spacing: Appearance.spacing.normal
|
spacing: Appearance.spacing.normal
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,10 @@ RowLayout {
|
||||||
anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
|
anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: leftContent.height
|
contentHeight: leftContent.height
|
||||||
clip: true
|
|
||||||
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
|
flickable: parent
|
||||||
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: leftContent
|
id: leftContent
|
||||||
|
|
@ -225,17 +228,16 @@ RowLayout {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
|
||||||
StyledFlickable {
|
StyledFlickable {
|
||||||
id: rightFlickable
|
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Appearance.padding.large * 2
|
anchors.margins: Appearance.padding.normal
|
||||||
|
anchors.leftMargin: 0
|
||||||
|
anchors.rightMargin: Appearance.padding.normal / 2
|
||||||
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: contentLayout.implicitHeight
|
contentHeight: contentLayout.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: rightFlickable
|
flickable: parent
|
||||||
}
|
}
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|
@ -244,6 +246,8 @@ RowLayout {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.leftMargin: Appearance.padding.large * 2
|
||||||
|
anchors.rightMargin: Appearance.padding.large * 2
|
||||||
|
|
||||||
spacing: Appearance.spacing.normal
|
spacing: Appearance.spacing.normal
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,6 @@ RowLayout {
|
||||||
|
|
||||||
radius: rightBorder.innerRadius
|
radius: rightBorder.innerRadius
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
clip: true
|
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
id: loader
|
id: loader
|
||||||
|
|
@ -60,7 +59,6 @@ RowLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Appearance.padding.large * 2
|
anchors.margins: Appearance.padding.large * 2
|
||||||
|
|
||||||
clip: true
|
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
sourceComponent: pane ? details : settings
|
sourceComponent: pane ? details : settings
|
||||||
|
|
||||||
|
|
@ -108,7 +106,6 @@ RowLayout {
|
||||||
StyledFlickable {
|
StyledFlickable {
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: settingsInner.height
|
contentHeight: settingsInner.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
Settings {
|
Settings {
|
||||||
id: settingsInner
|
id: settingsInner
|
||||||
|
|
|
||||||
|
|
@ -153,6 +153,7 @@ RowLayout {
|
||||||
anchors.margins: Appearance.padding.large + Appearance.padding.normal
|
anchors.margins: Appearance.padding.large + Appearance.padding.normal
|
||||||
anchors.leftMargin: Appearance.padding.large
|
anchors.leftMargin: Appearance.padding.large
|
||||||
anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
|
anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
|
||||||
|
anchors.bottomMargin: 0
|
||||||
|
|
||||||
spacing: Appearance.spacing.small
|
spacing: Appearance.spacing.small
|
||||||
|
|
||||||
|
|
@ -335,12 +336,16 @@ RowLayout {
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Appearance.padding.large * 2
|
anchors.margins: Appearance.padding.normal
|
||||||
|
anchors.leftMargin: 0
|
||||||
|
anchors.rightMargin: Appearance.padding.normal / 2
|
||||||
|
|
||||||
spacing: Appearance.spacing.normal
|
spacing: Appearance.spacing.normal
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
Layout.leftMargin: Appearance.padding.large * 2
|
||||||
|
Layout.rightMargin: Appearance.padding.large * 2
|
||||||
implicitWidth: iconLoader.implicitWidth
|
implicitWidth: iconLoader.implicitWidth
|
||||||
implicitHeight: iconLoader.implicitHeight
|
implicitHeight: iconLoader.implicitHeight
|
||||||
|
|
||||||
|
|
@ -376,6 +381,8 @@ RowLayout {
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
|
Layout.leftMargin: Appearance.padding.large * 2
|
||||||
|
Layout.rightMargin: Appearance.padding.large * 2
|
||||||
text: root.selectedApp ? (root.selectedApp.name || root.selectedApp.entry?.name || qsTr("Application Details")) : qsTr("Launcher Applications")
|
text: root.selectedApp ? (root.selectedApp.name || root.selectedApp.entry?.name || qsTr("Application Details")) : qsTr("Launcher Applications")
|
||||||
font.pointSize: Appearance.font.size.large
|
font.pointSize: Appearance.font.size.large
|
||||||
font.bold: true
|
font.bold: true
|
||||||
|
|
@ -385,12 +392,13 @@ RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.topMargin: Appearance.spacing.large
|
Layout.topMargin: Appearance.spacing.large
|
||||||
|
Layout.leftMargin: Appearance.padding.large * 2
|
||||||
|
Layout.rightMargin: Appearance.padding.large * 2
|
||||||
|
|
||||||
StyledFlickable {
|
StyledFlickable {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: debugLayout.implicitHeight
|
contentHeight: debugLayout.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: parent
|
flickable: parent
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,8 @@ Item {
|
||||||
id: leftFlickable
|
id: leftFlickable
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Appearance.padding.large + Appearance.padding.normal
|
|
||||||
anchors.leftMargin: Appearance.padding.large
|
|
||||||
anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: leftContent.height
|
contentHeight: leftContent.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: leftFlickable
|
flickable: leftFlickable
|
||||||
|
|
@ -54,6 +50,10 @@ Item {
|
||||||
|
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.margins: Appearance.padding.large + Appearance.padding.normal
|
||||||
|
anchors.leftMargin: Appearance.padding.large
|
||||||
|
anchors.rightMargin: Appearance.padding.large + Appearance.padding.normal / 2
|
||||||
spacing: Appearance.spacing.normal
|
spacing: Appearance.spacing.normal
|
||||||
|
|
||||||
// Settings header above the collapsible sections
|
// Settings header above the collapsible sections
|
||||||
|
|
@ -404,7 +404,6 @@ Item {
|
||||||
|
|
||||||
radius: rightBorder.innerRadius
|
radius: rightBorder.innerRadius
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
clip: true
|
|
||||||
|
|
||||||
// Right pane - networking details/settings
|
// Right pane - networking details/settings
|
||||||
Loader {
|
Loader {
|
||||||
|
|
@ -415,14 +414,17 @@ Item {
|
||||||
property var pane: ethernetPane || wirelessPane
|
property var pane: ethernetPane || wirelessPane
|
||||||
property string paneId: ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "")
|
property string paneId: ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "")
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.left: parent.left
|
||||||
anchors.margins: Appearance.padding.large * 2
|
anchors.right: parent.right
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.leftMargin: Appearance.padding.large * 2
|
||||||
|
anchors.rightMargin: Appearance.padding.large * 2
|
||||||
|
|
||||||
opacity: 1
|
opacity: 1
|
||||||
scale: 1
|
scale: 1
|
||||||
transformOrigin: Item.Center
|
transformOrigin: Item.Center
|
||||||
|
|
||||||
clip: true
|
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
|
sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
|
||||||
|
|
||||||
|
|
@ -476,15 +478,8 @@ Item {
|
||||||
id: settings
|
id: settings
|
||||||
|
|
||||||
StyledFlickable {
|
StyledFlickable {
|
||||||
id: settingsFlickable
|
|
||||||
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: settingsInner.height
|
contentHeight: settingsInner.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
|
||||||
flickable: settingsFlickable
|
|
||||||
}
|
|
||||||
|
|
||||||
NetworkSettings {
|
NetworkSettings {
|
||||||
id: settingsInner
|
id: settingsInner
|
||||||
|
|
|
||||||
|
|
@ -134,8 +134,7 @@ RowLayout {
|
||||||
id: sidebarFlickable
|
id: sidebarFlickable
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: sidebarLayout.implicitHeight + Appearance.padding.large * 2
|
contentHeight: sidebarLayout.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: sidebarFlickable
|
flickable: sidebarFlickable
|
||||||
|
|
@ -531,11 +530,12 @@ RowLayout {
|
||||||
|
|
||||||
StyledFlickable {
|
StyledFlickable {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.margins: Appearance.padding.large * 2
|
anchors.margins: Appearance.padding.normal
|
||||||
|
anchors.leftMargin: 0
|
||||||
|
anchors.rightMargin: Appearance.padding.normal / 2
|
||||||
|
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: contentLayout.implicitHeight
|
contentHeight: contentLayout.height
|
||||||
clip: true
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: parent
|
flickable: parent
|
||||||
|
|
@ -547,6 +547,8 @@ RowLayout {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
|
anchors.leftMargin: Appearance.padding.large * 2
|
||||||
|
anchors.rightMargin: Appearance.padding.large * 2
|
||||||
|
|
||||||
spacing: Appearance.spacing.normal
|
spacing: Appearance.spacing.normal
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue