moved quickshell around

This commit is contained in:
2025-07-24 03:00:40 +01:00
parent 8e587b5718
commit 75145b0f41
11 changed files with 36 additions and 104 deletions

View File

@@ -22,7 +22,7 @@ Item {
IconImage { IconImage {
// anchors.centerIn: parent // anchors.centerIn: parent
implicitSize: 27 implicitSize: 27
source: "root:Speaker.svg" source: "root:/assets/bar/Speaker.svg"
} }
@@ -35,7 +35,7 @@ Item {
IconImage { IconImage {
implicitSize: 26 implicitSize: 26
source: "root:Mic.svg" source: "root:/assets/bar/Mic.svg"
} }
Text { Text {

View File

@@ -39,8 +39,6 @@ import Quickshell.Widgets
sourceComponent: Audio {} sourceComponent: Audio {}
} }
RowLayout { RowLayout {
id: aaaaa
// If player disapear the seprator disapears with it
visible: Player.activePlayer.isPlaying() visible: Player.activePlayer.isPlaying()
VerticalSeprator {} VerticalSeprator {}
PlayerText { PlayerText {
@@ -54,6 +52,7 @@ import Quickshell.Widgets
font.pointSize: 10.75 font.pointSize: 10.75
} }
} }
SystemTray {}
// VerticalSeprator {} // VerticalSeprator {}
} }
} }

View File

@@ -1,53 +0,0 @@
import QtQuick
Item {
id: root
property bool fillWindowWidth: false;
property real extraVerticalMargin: 0;
property alias mouseArea: mouseArea;
property alias hoverEnabled: mouseArea.hoverEnabled;
property alias acceptedButtons: mouseArea.acceptedButtons;
property alias pressedButtons: mouseArea.pressedButtons;
property alias containsMouse: mouseArea.containsMouse;
property alias isPressed: mouseArea.pressed;
signal clicked(event: MouseEvent);
signal entered();
signal exited();
signal pressed(event: MouseEvent);
signal released(event: MouseEvent);
signal wheel(event: WheelEvent);
MouseArea {
id: mouseArea
anchors {
fill: parent
// not much point in finding exact values
leftMargin: root.fillWindowWidth ? -50 : 0
rightMargin: root.fillWindowWidth ? -50 : 0
topMargin: -root.extraVerticalMargin
bottomMargin: -root.extraVerticalMargin
}
Component.onCompleted: {
this.clicked.connect(root.clicked);
//this.entered.connect(root.entered);
//this.exited.connect(root.exited);
//this.pressed.connect(root.pressed);
this.released.connect(root.released);
//this.wheel.connect(root.wheel);
}
// for some reason MouseArea.pressed is both a prop and signal so connect doesn't work
onPressed: event => root.pressed(event);
// connecting to onwheel seems to implicitly accept it. undo that.
onWheel: event => {
event.accepted = false;
root.wheel(event);
}
}
}

View File

@@ -4,9 +4,7 @@ import Quickshell
import QtQuick.Layouts import QtQuick.Layouts
PopupWindow { PopupWindow {
property PlayerControllerV2 playerController: null; property PlayerControllerV2 player: PlayerControllerV2;
id: audioPopup id: audioPopup
anchor { anchor {
@@ -27,19 +25,19 @@ PopupWindow {
Image { Image {
id: coverImg id: coverImg
anchors.fill: parent anchors.fill: parent
source: Player.activePlayer.trackArtUrl; source: player.activePlayer.trackArtUrl;
width: 275 width: 275
height: 275 height: 275
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
} }
} }
Text { Text {
text: Player.activePlayer.trackTitle text: player.activePlayer.trackTitle
color: "white" color: "white"
font.pointSize: 10.75 font.pointSize: 10.75
} }
Text { Text {
text: Player.activePlayer.trackArtist text: player.activePlayer.trackArtist
color: "white" color: "white"
font.pointSize: 10.75 font.pointSize: 10.75
} }

View File

@@ -43,7 +43,7 @@ Item {
implicitWidth: 30; implicitWidth: 30;
IconImage { IconImage {
implicitSize: 30; implicitSize: 30;
source: "root:skip_next"; source: "root:assets/media_player/skip_next.svg";
scale: -1 scale: -1
} }
MouseArea { MouseArea {
@@ -58,7 +58,7 @@ Item {
implicitWidth: 30; implicitWidth: 30;
IconImage { IconImage {
implicitSize: 30; implicitSize: 30;
source: !Player.activePlayer.isPlaying ? "root:playbutton.svg" : "root:pausebutton.svg"; source: !Player.activePlayer.isPlaying ? "root:/assets/media_player/playbutton.svg" : "root:/assets/media_player/pausebutton.svg";
} }
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@@ -76,7 +76,7 @@ Item {
implicitWidth: 30; implicitWidth: 30;
IconImage { IconImage {
implicitSize: 30; implicitSize: 30;
source: "root:skip_next"; source: "root:assets/media_player/skip_next.svg";
} }
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@@ -86,44 +86,7 @@ Item {
} }
} }
} }
PopupWindow { PlayerPopup {
id: audioPopup id: audioPopup
color: "transparent"
anchor {
item: root
}
anchor.rect.x: root.width / 2 - width / 2
anchor.rect.y: root.height * 1.2
height: 350
width: 300
Rectangle {
anchors.fill: parent
color: "#919191"
ColumnLayout {
anchors.centerIn: parent
Item {
width: coverImg.width
height: coverImg.height
Image {
id: coverImg
anchors.fill: parent
source: Player.activePlayer.trackArtUrl;
width: 275
height: 275
fillMode: Image.PreserveAspectCrop
}
}
Text {
text: Player.activePlayer.trackTitle
color: "white"
font.pointSize: 10.75
}
Text {
text: Player.activePlayer.trackArtist
color: "white"
font.pointSize: 10.75
}
}
}
} }
} }

25
quickshell/SystemTray.qml Normal file
View File

@@ -0,0 +1,25 @@
import Quickshell
import Quickshell.Io
import QtQuick
import QtQuick.Layouts
import Quickshell.Widgets
import QtQuick.Effects
import Quickshell.Services.SystemTray
Item {
width: layout.width
height: layout.height
RowLayout {
id: layout
Repeater {
// id: repeater
model: SystemTray.items
required property int index
Text {
text: SystemTray.items.values[parent.index]
font.pointSize: 10
}
}
}
}

View File

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 463 B

View File

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 492 B

View File

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 176 B

View File

Before

Width:  |  Height:  |  Size: 155 B

After

Width:  |  Height:  |  Size: 155 B

View File

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B