diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/controlcenter/network/EthernetDetails.qml | 27 | ||||
| -rw-r--r-- | modules/controlcenter/network/NetworkingPane.qml | 27 | ||||
| -rw-r--r-- | modules/controlcenter/network/WirelessDetails.qml | 26 |
3 files changed, 37 insertions, 43 deletions
diff --git a/modules/controlcenter/network/EthernetDetails.qml b/modules/controlcenter/network/EthernetDetails.qml index f715970..c16eb9d 100644 --- a/modules/controlcenter/network/EthernetDetails.qml +++ b/modules/controlcenter/network/EthernetDetails.qml @@ -16,6 +16,8 @@ Item { required property Session session readonly property var device: session.ethernet.active + anchors.fill: parent + Component.onCompleted: { if (device && device.interface) { Nmcli.getEthernetDeviceDetails(device.interface, () => {}); @@ -30,25 +32,12 @@ Item { } } - StyledFlickable { - id: flickable - - anchors.fill: parent - - flickableDirection: Flickable.VerticalFlick - clip: true - contentHeight: layout.height - - StyledScrollBar.vertical: StyledScrollBar { - flickable: flickable - } - - ColumnLayout { - id: layout + ColumnLayout { + id: layout - anchors.left: parent.left - anchors.right: parent.right - spacing: Appearance.spacing.normal + anchors.left: parent.left + anchors.right: parent.right + spacing: Appearance.spacing.normal ConnectionHeader { icon: "cable" @@ -112,8 +101,6 @@ Item { deviceDetails: Nmcli.ethernetDeviceDetails } } - - } } }
\ No newline at end of file diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml index 3601b8b..680e495 100644 --- a/modules/controlcenter/network/NetworkingPane.qml +++ b/modules/controlcenter/network/NetworkingPane.qml @@ -463,6 +463,7 @@ Item { opacity: 1 scale: 1 transformOrigin: Item.Center + clip: false asynchronous: true sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings @@ -533,16 +534,34 @@ Item { Component { id: ethernetDetails - EthernetDetails { - session: root.session + StyledFlickable { + flickableDirection: Flickable.VerticalFlick + contentHeight: ethernetDetailsInner.height + + EthernetDetails { + id: ethernetDetailsInner + + anchors.left: parent.left + anchors.right: parent.right + session: root.session + } } } Component { id: wirelessDetails - WirelessDetails { - session: root.session + StyledFlickable { + flickableDirection: Flickable.VerticalFlick + contentHeight: wirelessDetailsInner.height + + WirelessDetails { + id: wirelessDetailsInner + + anchors.left: parent.left + anchors.right: parent.right + session: root.session + } } } } diff --git a/modules/controlcenter/network/WirelessDetails.qml b/modules/controlcenter/network/WirelessDetails.qml index 82ac975..6b7cb15 100644 --- a/modules/controlcenter/network/WirelessDetails.qml +++ b/modules/controlcenter/network/WirelessDetails.qml @@ -17,6 +17,8 @@ Item { required property Session session readonly property var network: session.network.active + anchors.fill: parent + Component.onCompleted: { updateDeviceDetails(); checkSavedProfile(); @@ -98,25 +100,12 @@ Item { } } - StyledFlickable { - id: flickable - - anchors.fill: parent + ColumnLayout { + id: layout - flickableDirection: Flickable.VerticalFlick - clip: true - contentHeight: layout.height - - StyledScrollBar.vertical: StyledScrollBar { - flickable: flickable - } - - ColumnLayout { - id: layout - - anchors.left: parent.left - anchors.right: parent.right - spacing: Appearance.spacing.normal + anchors.left: parent.left + anchors.right: parent.right + spacing: Appearance.spacing.normal ConnectionHeader { icon: root.network?.isSecure ? "lock" : "wifi" @@ -214,7 +203,6 @@ Item { deviceDetails: Nmcli.wirelessDeviceDetails } } - } } function handleConnect(): void { |