Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Fix creating wallpaper

Browse Source
This commit is contained in:
Elias 2019-06-12 16:39:49 +02:00
parent 19f014bb41
commit 1bb6b87edb
3 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ScreenPlay/qml/Installed/ScreenPlayItem.qml
View File

@ -201,7 +201,8 @@ Item {
onClicked: {
if (mouse.button === Qt.LeftButton) {
utility.setSidebarItem(screenId, type)
utility.setSidebarItem(screenPlayItem.screenId, screenPlayItem.type.toString())
} else if (mouse.button === Qt.RightButton) {
if (workshopID != 0) {
miWorkshop.enabled = true
@ -298,28 +299,6 @@ Item {
}
]
transitions: [
Transition {
from: "invisible"
to: "visible"
// PropertyAnimation {
// target: screenPlayItemWrapper
// properties: "y"
// duration: 300
// easing.type: Easing.OutQuart
// }
// OpacityAnimator {
// target: screenPlayItemWrapper
// duration: 500
// easing.type: Easing.OutQuart
// }
// PropertyAnimation {
// target: effect
// property: "opacity"
// duration: 500
// easing.type: Easing.OutQuart
// }
},
Transition {
from: "visible"
to: "hover"

23
ScreenPlay/qml/Installed/Sidebar.qml
View File

@ -20,6 +20,10 @@ Item {
target: utility
onSetSidebarItem: {
activeScreen = screenId
sidebar.type = type
if ((type === "video")) {
if (activeScreen == screenId
&& state == "active") {
@ -27,21 +31,30 @@ Item {
} else {
state = "active"
}
} else if (type === "widget") {
return
}
if (type === "widget") {
if (activeScreen == screenId
&& state == "activeWidget") {
state = "inactive"
} else {
state = "activeWidget"
}
} else if (type === "qmlScene") {
return
}
if (type === "qmlScene") {
if (activeScreen == screenId
&& state == "activeScene") {
state = "inactive"
} else {
state = "activeScene"
}
} else if (type === "html") {
return
}
if (type === "html") {
if (activeScreen == screenId
&& state == "activeScene") {
state = "inactive"
@ -49,8 +62,7 @@ Item {
state = "activeScene"
}
}
activeScreen = screenId
type = type
}
}
@ -386,6 +398,7 @@ Item {
}
onClicked: {
print(sidebar.type)
if (type === "video" || type === "qmlScene" || type === "html") {
screenPlay.createWallpaper(
monitorSelection.activeMonitorIndex, installedListModel.absoluteStoragePath + "/" + activeScreen,

1
ScreenPlay/src/qmlutilities.h
View File

@ -12,6 +12,7 @@ namespace ScreenPlay {
class QMLUtilities : public QObject {
Q_OBJECT
public:
explicit QMLUtilities(QObject* parent = nullptr);