diff --git a/modules/utilities/Content.qml b/modules/utilities/Content.qml index 902656de..507debc0 100644 --- a/modules/utilities/Content.qml +++ b/modules/utilities/Content.qml @@ -1,5 +1,7 @@ import "cards" +import qs.components import qs.config +import qs.modules.bar.popouts as BarPopouts import QtQuick import QtQuick.Layouts @@ -7,8 +9,8 @@ Item { id: root required property var props - required property var visibilities - required property Item popouts + required property DrawerVisibilities visibilities + required property BarPopouts.Wrapper popouts implicitWidth: layout.implicitWidth implicitHeight: layout.implicitHeight diff --git a/modules/utilities/Wrapper.qml b/modules/utilities/Wrapper.qml index d3371dde..c8660a2f 100644 --- a/modules/utilities/Wrapper.qml +++ b/modules/utilities/Wrapper.qml @@ -8,7 +8,7 @@ import QtQuick Item { id: root - required property var visibilities + required property DrawerVisibilities visibilities required property Item sidebar required property Item popouts diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml index 407b88ae..b8653159 100644 --- a/modules/utilities/cards/Record.qml +++ b/modules/utilities/cards/Record.qml @@ -11,7 +11,7 @@ StyledRect { id: root required property var props - required property var visibilities + required property DrawerVisibilities visibilities Layout.fillWidth: true implicitHeight: layout.implicitHeight + layout.anchors.margins * 2 diff --git a/modules/utilities/cards/RecordingList.qml b/modules/utilities/cards/RecordingList.qml index 355ee019..af006cf9 100644 --- a/modules/utilities/cards/RecordingList.qml +++ b/modules/utilities/cards/RecordingList.qml @@ -16,7 +16,7 @@ ColumnLayout { id: root required property var props - required property var visibilities + required property DrawerVisibilities visibilities spacing: 0 diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml index 2ca93db6..4f17073d 100644 --- a/modules/utilities/cards/Toggles.qml +++ b/modules/utilities/cards/Toggles.qml @@ -4,6 +4,7 @@ import qs.components import qs.components.controls import qs.services import qs.config +import qs.modules.bar.popouts as BarPopouts import Quickshell.Bluetooth import QtQuick import QtQuick.Layouts @@ -11,8 +12,8 @@ import QtQuick.Layouts StyledRect { id: root - required property var visibilities - required property Item popouts + required property DrawerVisibilities visibilities + required property BarPopouts.Wrapper popouts readonly property var quickToggles: { const seenIds = new Set(); @@ -54,17 +55,17 @@ StyledRect { font.pointSize: Appearance.font.size.normal } - ToggleRow { + QuickToggleRow { rowModel: root.needExtraRow ? root.quickToggles.slice(0, root.splitIndex) : root.quickToggles } - ToggleRow { + QuickToggleRow { visible: root.needExtraRow rowModel: root.needExtraRow ? root.quickToggles.slice(root.splitIndex) : [] } } - component ToggleRow: RowLayout { + component QuickToggleRow: RowLayout { property var rowModel: [] Layout.fillWidth: true