fix:适配sdk接口

Signed-off-by: zhoudisi <zhoudisi@kylinos.cn>
This commit is contained in:
zhoudisi 2024-04-22 16:09:52 +08:00
parent d25d84eadf
commit 034a10b350
2 changed files with 6 additions and 1 deletions

View File

@ -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();
}

View File

@ -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();