diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 21cafc6..2f1accf 100755 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -817,7 +817,11 @@ void MainWindow::changeLightTheme() void MainWindow::pullUpWindow() { qDebug() << "show MainWindow"; - KWindowSystem::forceActiveWindow(this->winId()); + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) { + kabase::WindowManage::activateWindow(MainWindow::getInstance()->getWinId()); + }else{ + KWindowSystem::forceActiveWindow(this->winId()); + } this->show(); } diff --git a/src/menumodule/menumodule.cpp b/src/menumodule/menumodule.cpp index a05ffa1..deef770 100755 --- a/src/menumodule/menumodule.cpp +++ b/src/menumodule/menumodule.cpp @@ -109,6 +109,7 @@ void menuModule::aboutAction() m_aboutWindow->setBodyTextVisiable(true); m_aboutWindow->setWindowModality(Qt::WindowModal); m_aboutWindow->setWindowModality(Qt::ApplicationModal); + kabase::WindowManage::removeHeader(m_aboutWindow); m_aboutWindow->show(); m_aboutWindow->exec();