Merge branch 'master' into bshah/stuff

This commit is contained in:
Bhushan Shah 2018-02-12 21:16:14 +05:30
commit 7af3e39cd7
3 changed files with 2 additions and 4 deletions

View file

@ -95,9 +95,7 @@ void FullScreenPanel::showEvent(QShowEvent *event)
{ {
using namespace KWayland::Client; using namespace KWayland::Client;
QQuickWindow::showEvent(event); QQuickWindow::showEvent(event);
// setWindowState(Qt::WindowFullScreen);
} }
#include "fullscreenpanel.moc" #include "fullscreenpanel.moc"

View file

@ -40,7 +40,7 @@ FullScreenPanel {
property alias fixedArea: fixedArea property alias fixedArea: fixedArea
function open() { function open() {
window.visible = true; window.showFullScreen();
peekAnim.running = true; peekAnim.running = true;
} }
function close() { function close() {

View file

@ -83,7 +83,7 @@ FullScreenPanel {
property alias to: internalAnim.to property alias to: internalAnim.to
property alias from: internalAnim.from property alias from: internalAnim.from
ScriptAction { ScriptAction {
script: window.visible = true; script: window.showFullScreen();
} }
NumberAnimation { NumberAnimation {
id: internalAnim id: internalAnim