diff --git a/ksplash/ksplashqml/splashwindow.cpp b/ksplash/ksplashqml/splashwindow.cpp index 9e2035099..f498019df 100644 --- a/ksplash/ksplashqml/splashwindow.cpp +++ b/ksplash/ksplashqml/splashwindow.cpp @@ -1,166 +1,165 @@ /* * Copyright (C) 2010 Ivan Cukic * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, * or (at your option) any later version, as published by the Free * Software Foundation * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "splashwindow.h" #include "splashapp.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include SplashWindow::SplashWindow(bool testing, bool window, const QString &theme) : KQuickAddons::QuickViewSharedEngine(), m_stage(0), m_testing(testing), m_window(window), m_theme(theme) { setColor(Qt::transparent); setDefaultAlphaBuffer(true); setClearBeforeRendering(true); setResizeMode(KQuickAddons::QuickViewSharedEngine::SizeRootObjectToView); if (!m_window) { setFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); } if (!m_testing && !m_window) { if (KWindowSystem::isPlatformX11()) { // X11 specific hint only on X11 setFlags(Qt::BypassWindowManagerHint); } else if (!KWindowSystem::isPlatformWayland()) { // on other platforms go fullscreen // on Wayland we cannot go fullscreen due to QTBUG 54883 setWindowState(Qt::WindowFullScreen); } } if (m_testing && !m_window && !KWindowSystem::isPlatformWayland()) { setWindowState(Qt::WindowFullScreen); } //be sure it will be eventually closed //FIXME: should never be stuck QTimer::singleShot(30000, this, &QWindow::close); } void SplashWindow::setStage(int stage) { m_stage = stage; rootObject()->setProperty("stage", stage); } bool SplashWindow::event(QEvent *e) { if (e->type() == QEvent::PlatformSurface) { - if (auto pe = dynamic_cast(e)) { - switch (pe->surfaceEventType()) { - case QPlatformSurfaceEvent::SurfaceCreated: - setupWaylandIntegration(); - break; - case QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed: - delete m_shellSurface; - m_shellSurface = nullptr; - break; - } + auto pe = static_cast(e); + switch (pe->surfaceEventType()) { + case QPlatformSurfaceEvent::SurfaceCreated: + setupWaylandIntegration(); + break; + case QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed: + delete m_shellSurface; + m_shellSurface = nullptr; + break; } } return KQuickAddons::QuickViewSharedEngine::event(e); } void SplashWindow::keyPressEvent(QKeyEvent *event) { KQuickAddons::QuickViewSharedEngine::keyPressEvent(event); if (m_testing && !event->isAccepted() && event->key() == Qt::Key_Escape) { close(); } } void SplashWindow::mousePressEvent(QMouseEvent *event) { KQuickAddons::QuickViewSharedEngine::mousePressEvent(event); if (m_testing && !event->isAccepted()) { close(); } } void SplashWindow::setGeometry(const QRect& rect) { bool oldGeometryEmpty = geometry().isNull(); KQuickAddons::QuickViewSharedEngine::setGeometry(rect); if (oldGeometryEmpty) { KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel")); KConfigGroup cg(KSharedConfig::openConfig(), "KDE"); const QString packageName = cg.readEntry("LookAndFeelPackage", QString()); if (!packageName.isEmpty()) { package.setPath(packageName); } if (!m_theme.isEmpty()) { package.setPath(m_theme); } Q_ASSERT(package.isValid()); setSource(QUrl::fromLocalFile(package.filePath("splashmainscript"))); } if (m_shellSurface) { m_shellSurface->setPosition(geometry().topLeft()); } } void SplashWindow::setupWaylandIntegration() { if (m_shellSurface) { // already setup return; } if (SplashApp *a = qobject_cast(qApp)) { using namespace KWayland::Client; PlasmaShell *interface = a->waylandPlasmaShellInterface(); if (!interface) { return; } Surface *s = Surface::fromWindow(this); if (!s) { return; } m_shellSurface = interface->createSurface(s, this); // Use OSD to make it go above all other windows // that's the closest we have to the X11 unmanged layer we have on Wayland m_shellSurface->setRole(PlasmaShellSurface::Role::OnScreenDisplay); m_shellSurface->setPosition(geometry().topLeft()); } }