mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-11-22 18:52:30 +01:00
Merge branch 'dev' of https://gitlab.com/kelteseth/ScreenPlay into dev
This commit is contained in:
commit
db7aad83b4
@ -23,6 +23,21 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Action {
|
||||||
|
shortcut: "F5"
|
||||||
|
onTriggered: {
|
||||||
|
loader.sourceComponent = undefined
|
||||||
|
loader.source = ""
|
||||||
|
Widget.clearComponentCache()
|
||||||
|
if (Widget.type === "qmlWidget") {
|
||||||
|
loader.source = Qt.resolvedUrl(Widget.sourcePath)
|
||||||
|
} else if (Widget.type === "htmlWidget") {
|
||||||
|
loader.sourceComponent = webViewComponent
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
OpacityAnimator {
|
OpacityAnimator {
|
||||||
id: animFadeOut
|
id: animFadeOut
|
||||||
from: 1
|
from: 1
|
||||||
|
@ -90,6 +90,11 @@ void WidgetWindow::setWidgetSize(const int with, const int height)
|
|||||||
m_window.setHeight(height);
|
m_window.setHeight(height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WidgetWindow::clearComponentCache()
|
||||||
|
{
|
||||||
|
m_window.engine()->clearComponentCache();
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
void WidgetWindow::setWindowBlur(unsigned int style)
|
void WidgetWindow::setWindowBlur(unsigned int style)
|
||||||
{
|
{
|
||||||
|
@ -68,6 +68,7 @@ public slots:
|
|||||||
void setPos(int xPos, int yPos);
|
void setPos(int xPos, int yPos);
|
||||||
void setClickPos(const QPoint& clickPos);
|
void setClickPos(const QPoint& clickPos);
|
||||||
void setWidgetSize(const int with, const int height);
|
void setWidgetSize(const int with, const int height);
|
||||||
|
void clearComponentCache();
|
||||||
|
|
||||||
void setAppID(QString appID)
|
void setAppID(QString appID)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user