1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 08:22:33 +02:00

Add osx close icon and remove hardcoded size

This commit is contained in:
Elias Steurer 2023-02-04 10:51:16 +01:00
parent 13959b39cf
commit df33695e7d
3 changed files with 14 additions and 6 deletions

View File

@ -191,6 +191,7 @@ set(RESOURCES
assets/images/scale_window_indicator.png
assets/images/steam_offline.png
assets/images/trayIcon_windows.png
assets/images/trayIcon_osx.png
assets/images/Window.svg
assets/licenses/Apache2.txt
assets/licenses/OFL.txt

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -18,12 +18,11 @@ import Qt5Compat.GraphicalEffects
Util.Popup {
id: root
property ApplicationWindow applicationWindow
contentHeight: 400
contentWidth: 600
contentItem: Item {
contentItem: Pane {
background: Item{}
padding:20
bottomPadding: 10
ColumnLayout {
anchors.margins: 20
anchors.fill: parent
spacing: 20
Text {
@ -39,7 +38,15 @@ Util.Popup {
Image {
Layout.alignment: Qt.AlignHCenter
source: "qrc:/qml/ScreenPlayApp/assets/images/trayIcon_windows.png"
source: {
if (Qt.platform.os === "windows") {
return "qrc:/qml/ScreenPlayApp/assets/images/trayIcon_windows.png"
}
if (Qt.platform.os === "osx") {
return "qrc:/qml/ScreenPlayApp/assets/images/trayIcon_osx.png"
}
}
fillMode: Image.PreserveAspectFit
}