!23 wlcom适配

Merge pull request !23 from zhoudisi/openkylin/nile

debian/changelog

@@ -1,3 +1,12 @@
+kylin-calculator (1.2.0.0-ok6.5) v101; urgency=medium
+
+  * BUG: 无
+  * 需求号: 无
+  * 其他改动说明: TASK:#205200 子 【百日攻关】【图形栈合成渲染技术】UKUI应用适配 / 【百日攻关】【图形栈合成渲染技术】UKUI应用适配 - 计算器
+  * 其他改动影响域: 无
+
+ -- zhoudisi <zhoudisi@kylinos.cn>  Mon, 22 Apr 2024 18:07:40 +0800
+
 kylin-calculator (1.2.0.0-ok6.4) nile; urgency=medium
 
   * BUG: 无

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

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