diff --git a/components/StyledPanelWindow.qml b/components/StyledPanelWindow.qml index dab6ee0..0426201 100644 --- a/components/StyledPanelWindow.qml +++ b/components/StyledPanelWindow.qml @@ -7,11 +7,13 @@ PanelWindow { id: window required property string name + property alias background: background WlrLayershell.namespace: `lux-${name}` color: "transparent" Rectangle { + id: background anchors.fill: parent radius: Styling.theme.radiusBox Behavior on radius { diff --git a/components/StyledTabBar.qml b/components/StyledTabBar.qml index 3c0b933..c81c935 100644 --- a/components/StyledTabBar.qml +++ b/components/StyledTabBar.qml @@ -1,4 +1,3 @@ -import qs.config import QtQuick import QtQuick.Controls.Basic @@ -11,10 +10,10 @@ TabBar { id: view model: control.contentModel currentIndex: control.currentIndex + spacing: control.spacing orientation: ListView.Horizontal boundsBehavior: Flickable.StopAtBounds } - background: Rectangle { - color: Styling.theme.base200 - } + + background: Item {} } diff --git a/components/StyledTabButton.qml b/components/StyledTabButton.qml index 8cfbbfe..1c85273 100644 --- a/components/StyledTabButton.qml +++ b/components/StyledTabButton.qml @@ -5,6 +5,8 @@ import QtQuick.Controls.Basic TabButton { id: control + property alias radius: rectangle.radius + contentItem: Text { font.pixelSize: Styling.typography.textSize.base font.family: Styling.typography.fontFamily diff --git a/modules/configuration/AudioView.qml b/modules/configuration/AudioView.qml index 9f0e6af..aed90ba 100644 --- a/modules/configuration/AudioView.qml +++ b/modules/configuration/AudioView.qml @@ -23,7 +23,7 @@ ColumnLayout { StyledText { Layout.column: 1 Layout.row: 1 - text: "Speakers" + text: "Device" } StyledComboBox { @@ -36,6 +36,23 @@ ColumnLayout { Pipewire.setSink(Pipewire.sinks[index]); } } + + StyledText { + Layout.column: 1 + Layout.row: 2 + text: "Volume" + } + + StyledSlider { + Layout.column: 2 + Layout.row: 2 + from: 0.0 + to: 1.0 + value: Pipewire.volume + onMoved: { + Pipewire.setVolume(value); + } + } } } diff --git a/services/Pipewire.qml b/services/Pipewire.qml index 4cdd60b..5e28710 100644 --- a/services/Pipewire.qml +++ b/services/Pipewire.qml @@ -19,7 +19,7 @@ Singleton { function setVolume(volume: real): void { if (sink?.ready && sink?.audio) { sink.audio.muted = false; - sink.audio.volume = volume; + sink.audio.volume = Math.min(volume, 1.0); } }