diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index d8263ee..56a6051 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +1 \ No newline at end of file diff --git a/pikabar/debian/changelog b/pikabar/debian/changelog index eced0b2..92a15ba 100644 --- a/pikabar/debian/changelog +++ b/pikabar/debian/changelog @@ -1,4 +1,4 @@ -pikabar (1.0.0-101pika15) pika; urgency=medium +pikabar (1.0.0-101pika16) pika; urgency=medium * Less of a chonker diff --git a/pikabar/usr/share/pikabar/Topbar.qml b/pikabar/usr/share/pikabar/Topbar.qml index a61e39f..5cc69c5 100644 --- a/pikabar/usr/share/pikabar/Topbar.qml +++ b/pikabar/usr/share/pikabar/Topbar.qml @@ -93,7 +93,7 @@ PanelWindow { top: parent.top bottom: parent.bottom } - spacing: 10 + spacing: 0 Widgets.Stats { updateInterval: sysInfoInterval diff --git a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml index e464db5..4d1990c 100644 --- a/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml +++ b/pikabar/usr/share/pikabar/widgets/ActiveWindow.qml @@ -7,7 +7,6 @@ import "root:/" BarWidget { id: wrapper - color: "transparent" property int maxWidth: 100 Layout.fillWidth: true diff --git a/pikabar/usr/share/pikabar/widgets/BarWidget.qml b/pikabar/usr/share/pikabar/widgets/BarWidget.qml index a14c88b..27db3fa 100644 --- a/pikabar/usr/share/pikabar/widgets/BarWidget.qml +++ b/pikabar/usr/share/pikabar/widgets/BarWidget.qml @@ -1,6 +1,6 @@ import QtQuick -Rectangle { +Item { id: root property real padding: 6 // all items placed inside the BarWidget will go to the content item diff --git a/pikabar/usr/share/pikabar/widgets/Clock.qml b/pikabar/usr/share/pikabar/widgets/Clock.qml index 6b2ed14..3a864c8 100644 --- a/pikabar/usr/share/pikabar/widgets/Clock.qml +++ b/pikabar/usr/share/pikabar/widgets/Clock.qml @@ -5,11 +5,9 @@ import "root:/" BarWidget { id: clockWidget - color: "transparent" - Layout.minimumWidth: clockLayout.implicitWidth + 20 + Layout.minimumWidth: clockLayout.implicitWidth + 10 Layout.minimumHeight: clockLayout.implicitHeight widgetAnchors.margins: 10 - radius: 25 property bool calendarOpen: false @@ -17,7 +15,7 @@ BarWidget { id: background anchors.margins: 0 anchors.centerIn: parent - width: clockLayout.implicitWidth + 20 + width: clockLayout.implicitWidth + 10 height: 30 color: "#40ffffff" radius: 0 diff --git a/pikabar/usr/share/pikabar/widgets/NowPlaying.qml b/pikabar/usr/share/pikabar/widgets/NowPlaying.qml index 795eb7f..9e5dce1 100644 --- a/pikabar/usr/share/pikabar/widgets/NowPlaying.qml +++ b/pikabar/usr/share/pikabar/widgets/NowPlaying.qml @@ -9,7 +9,6 @@ import "root:/" BarWidget { id: root property int maxWidth: 100 - color: "transparent" implicitHeight: 30 implicitWidth: mainRect.implicitWidth width: mainRect.implicitWidth @@ -44,7 +43,7 @@ BarWidget { try { const data = JSON.parse(line); for (let i = 0; i < data.length && i < visualizerRepeater.count; i++) { - const newHeight = visualizerRepeater.itemAt(i).height = (data[i] / 1500) * 30 + 25; + const newHeight = visualizerRepeater.itemAt(i).height = ((data[i] / 1500) * 30)+ 20; } } catch (e) { console.log("Failed to parse cava output:", e); @@ -77,7 +76,7 @@ BarWidget { } } - Rectangle { + Item { id: mainRect anchors { fill: parent @@ -85,26 +84,22 @@ BarWidget { rightMargin: 8 } implicitWidth: artContainer.width + titleContainer.width + 48 - color: "transparent" - radius: 8 visible: root.player?.playbackState === MprisPlaybackState.Playing || root.player?.playbackState === MprisPlaybackState.Paused - Rectangle { + Item { id: artContainer width: 30 height: 30 anchors.left: parent.left anchors.leftMargin: 32 anchors.verticalCenter: parent.verticalCenter - color: "transparent" - radius: parent.radius ClippingWrapperRectangle { anchors.fill: parent anchors.topMargin: 2 anchors.rightMargin: 2 color: "transparent" - radius: parent.radius + radius: 8 resizeChild: true border.color: "#9900246b" border.width: 2 @@ -122,11 +117,12 @@ BarWidget { color: "black" opacity: 0.3 visible: mouseArea.containsMouse - radius: parent.radius + radius: 8 } Text { anchors.centerIn: parent + anchors.verticalCenterOffset: 2 text: root.player?.playbackState === MprisPlaybackState.Playing ? "pause" : "play_arrow" font.family: Globals.commonStyles.iconFontFamily font.pixelSize: Globals.commonStyles.iconFontSizeSmall diff --git a/pikabar/usr/share/pikabar/widgets/Power.qml b/pikabar/usr/share/pikabar/widgets/Power.qml index fae215b..71a44e1 100644 --- a/pikabar/usr/share/pikabar/widgets/Power.qml +++ b/pikabar/usr/share/pikabar/widgets/Power.qml @@ -18,7 +18,6 @@ Loader { BarWidget { id: widget anchors.fill: parent - color: "transparent" RowLayout { anchors.fill: parent diff --git a/pikabar/usr/share/pikabar/widgets/Stats.qml b/pikabar/usr/share/pikabar/widgets/Stats.qml index 14a06fe..4931ec0 100644 --- a/pikabar/usr/share/pikabar/widgets/Stats.qml +++ b/pikabar/usr/share/pikabar/widgets/Stats.qml @@ -5,9 +5,9 @@ import QtQuick.Layouts import QtQuick.Controls import "root:/" -BarWidget { +Item { id: root - color: "transparent" + //color: "transparent" implicitHeight: 30 implicitWidth: mainRect.width @@ -34,12 +34,10 @@ BarWidget { } } - Rectangle { + Item { id: mainRect height: parent.height width: layout.width - color: "transparent" - radius: 8 RowLayout { id: layout diff --git a/pikabar/usr/share/pikabar/widgets/SystemTray.qml b/pikabar/usr/share/pikabar/widgets/SystemTray.qml index 4738444..eb39d9a 100644 --- a/pikabar/usr/share/pikabar/widgets/SystemTray.qml +++ b/pikabar/usr/share/pikabar/widgets/SystemTray.qml @@ -8,20 +8,21 @@ import "root:/" BarWidget { id: root - color: "transparent" // This removes BarWidget's implicit padding so the mouse areas of // each tray item cover as much area as possible. widgetAnchors.margins: 0 - widgetAnchors.leftMargin: 3 - widgetAnchors.rightMargin: 3 + widgetAnchors.leftMargin: 5 + widgetAnchors.rightMargin: 0 height: 30 implicitHeight: 30 + implicitWidth: trayLayout.implicitWidth + 5 RowLayout { + id: trayLayout anchors.fill: parent anchors.bottomMargin: 0 - spacing: 10 + spacing: 5 Repeater { model: SystemTray.items @@ -63,7 +64,6 @@ BarWidget { source: item && item.icon ? item.icon : "" visible: status === Image.Ready implicitSize: 20 - smooth: true } BarTooltip { relativeItem: delegate.containsMouse ? delegate : null diff --git a/pikabar/usr/share/pikabar/widgets/Weather.qml b/pikabar/usr/share/pikabar/widgets/Weather.qml index 7aeb237..add1e00 100644 --- a/pikabar/usr/share/pikabar/widgets/Weather.qml +++ b/pikabar/usr/share/pikabar/widgets/Weather.qml @@ -6,7 +6,6 @@ import "root:/" BarWidget { id: root - color: "transparent" implicitHeight: 30 implicitWidth: mainRect.width @@ -99,12 +98,10 @@ BarWidget { xhr.send(); } - Rectangle { + Item { id: mainRect height: parent.height width: layout.width + 10 - color: "transparent" - radius: 8 MouseArea { id: mouseArea diff --git a/pikabar/usr/share/pikabar/widgets/Workspaces.qml b/pikabar/usr/share/pikabar/widgets/Workspaces.qml index 97dc01e..b8c5898 100644 --- a/pikabar/usr/share/pikabar/widgets/Workspaces.qml +++ b/pikabar/usr/share/pikabar/widgets/Workspaces.qml @@ -7,7 +7,6 @@ import "root:/" BarWidget { id: root - color: "transparent" Layout.alignment: Qt.AlignLeft property int workspaces: 10 Layout.fillHeight: true