diff options
| -rw-r--r-- | modules/controlcenter/Panes.qml | 5 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/BtPane.qml | 78 | ||||
| -rw-r--r-- | modules/controlcenter/bluetooth/DeviceList.qml | 1 |
3 files changed, 45 insertions, 39 deletions
diff --git a/modules/controlcenter/Panes.qml b/modules/controlcenter/Panes.qml index d8c47d6..f60d0c6 100644 --- a/modules/controlcenter/Panes.qml +++ b/modules/controlcenter/Panes.qml @@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound import "bluetooth" import qs.components -import qs.components.effects import qs.services import qs.config import Quickshell.Widgets @@ -64,10 +63,6 @@ ClippingRectangle { } } - InnerBorder { - leftThickness: 0 - } - component Pane: Item { id: pane diff --git a/modules/controlcenter/bluetooth/BtPane.qml b/modules/controlcenter/bluetooth/BtPane.qml index 66fe0c8..96dc002 100644 --- a/modules/controlcenter/bluetooth/BtPane.qml +++ b/modules/controlcenter/bluetooth/BtPane.qml @@ -4,6 +4,7 @@ import ".." import qs.components.effects import qs.components.containers import qs.config +import Quickshell.Widgets import Quickshell.Bluetooth import QtQuick import QtQuick.Layouts @@ -23,6 +24,7 @@ RowLayout { Layout.fillHeight: true DeviceList { + 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 @@ -40,44 +42,52 @@ RowLayout { Layout.fillWidth: true Layout.fillHeight: true - Loader { - id: loader + ClippingRectangle { + anchors.fill: parent + anchors.margins: Appearance.padding.normal + anchors.leftMargin: 0 + anchors.rightMargin: Appearance.padding.normal / 2 - property BluetoothDevice pane: root.session.bt.active + radius: rightBorder.innerRadius + color: "transparent" - anchors.fill: parent - anchors.margins: Appearance.padding.large * 2 + Appearance.padding.normal - anchors.leftMargin: Appearance.padding.large * 2 - anchors.rightMargin: Appearance.padding.large * 2 + Appearance.padding.normal / 2 + Loader { + id: loader - asynchronous: true - sourceComponent: pane ? details : settings + property BluetoothDevice pane: root.session.bt.active - Behavior on pane { - SequentialAnimation { - ParallelAnimation { - Anim { - property: "opacity" - to: 0 - easing.bezierCurve: Appearance.anim.curves.standardAccel - } - Anim { - property: "scale" - to: 0.8 - easing.bezierCurve: Appearance.anim.curves.standardAccel - } - } - PropertyAction {} - ParallelAnimation { - Anim { - property: "opacity" - to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + anchors.fill: parent + anchors.margins: Appearance.padding.large * 2 + + asynchronous: true + sourceComponent: pane ? details : settings + + Behavior on pane { + SequentialAnimation { + ParallelAnimation { + Anim { + property: "opacity" + to: 0 + easing.bezierCurve: Appearance.anim.curves.standardAccel + } + Anim { + property: "scale" + to: 0.8 + easing.bezierCurve: Appearance.anim.curves.standardAccel + } } - Anim { - property: "scale" - to: 1 - easing.bezierCurve: Appearance.anim.curves.standardDecel + PropertyAction {} + ParallelAnimation { + Anim { + property: "opacity" + to: 1 + easing.bezierCurve: Appearance.anim.curves.standardDecel + } + Anim { + property: "scale" + to: 1 + easing.bezierCurve: Appearance.anim.curves.standardDecel + } } } } @@ -85,6 +95,8 @@ RowLayout { } InnerBorder { + id: rightBorder + leftThickness: Appearance.padding.normal / 2 } diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml index 83b8200..a1644e5 100644 --- a/modules/controlcenter/bluetooth/DeviceList.qml +++ b/modules/controlcenter/bluetooth/DeviceList.qml @@ -20,7 +20,6 @@ ColumnLayout { readonly property bool smallDiscoverable: width <= 540 readonly property bool smallPairable: width <= 480 - anchors.fill: parent spacing: Appearance.spacing.small RowLayout { |