!2 使用kysdk接口以解决wayland环境下窗口位置异常问题双标题栏问题.

Merge pull request !2 from iaom/openkylin/yangtze

debian/control

@@ -21,7 +21,8 @@ Build-Depends: debhelper (>=9.0.0),
                qtbase5-dev,
                qtchooser,
                qtscript5-dev,
-               qttools5-dev-tools
+               qttools5-dev-tools,
+               libkysdk-waylandhelper-dev
 Standards-Version: 4.5.0
 Homepage: https://www.ukui.org/
 Vcs-Git: https://github.com/ukui/ukui-search.git

frontend/control/create-index-ask-dialog.cpp

@@ -21,7 +21,7 @@
 
 #include "create-index-ask-dialog.h"
 #include <QPainterPath>
-#include "kwindowsystem.h"
+#include <KWindowSystem>
 
 #define MAIN_SIZE QSize(380, 202)
 #define MAIN_SPACING 0

frontend/frontend.pro

@@ -7,7 +7,7 @@ DEFINES += VERSION='\\"$${VERSION}\\"'
 TARGET = ukui-search
 TEMPLATE = app
 
-PKGCONFIG += gio-2.0 glib-2.0 gio-unix-2.0
+PKGCONFIG += gio-2.0 glib-2.0 gio-unix-2.0 kysdk-waylandhelper
 CONFIG += c++11 link_pkgconfig no_keywords lrelease
 LIBS += -lxapian -lgsettings-qt -lquazip5 -lX11
 #LIBS += -lukui-log4qt

frontend/mainwindow.cpp

@@ -31,10 +31,12 @@
 #include <QPixmap>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
 #include <KWindowEffects>
-#include "kwindowsystem.h"
+#include <KWindowSystem>
 #endif
-#include "global-settings.h"
 #include <QtX11Extras/QX11Info>
+#include "ukuistylehelper/ukuistylehelper.h"
+#include "windowmanager/windowmanager.h"
+#include "global-settings.h"
 
 #define MAIN_MARGINS 0, 0, 0, 0
 #define TITLE_MARGINS 0,0,0,0
@@ -150,11 +152,11 @@ void MainWindow::initUi() {
     //创建索引询问弹窗
     m_askDialog = new CreateIndexAskDialog(this);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
-    MotifWmHints ask_dialog_hints;
-    ask_dialog_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
-    ask_dialog_hints.functions = MWM_FUNC_ALL;
-    ask_dialog_hints.decorations = MWM_DECOR_BORDER;
-    XAtomHelper::getInstance()->setWindowMotifHint(m_askDialog->winId(), ask_dialog_hints);
+//    MotifWmHints ask_dialog_hints;
+//    ask_dialog_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
+//    ask_dialog_hints.functions = MWM_FUNC_ALL;
+//    ask_dialog_hints.decorations = MWM_DECOR_BORDER;
+//    XAtomHelper::getInstance()->setWindowMotifHint(m_askDialog->winId(), ask_dialog_hints);
 #endif
 }
 
@@ -192,7 +194,6 @@ void MainWindow::bootOptionsFilter(QString opt) {
         if (this->isHidden()) {
             clearSearchResult();
             centerToScreen(this);
-            this->show();
             this->m_searchBarWidget->setFocus();
             this->activateWindow();
         }
@@ -217,7 +218,6 @@ void MainWindow::trayIconActivatedSlot(QSystemTrayIcon::ActivationReason reason)
         if(!this->isVisible()) {
             clearSearchResult();
             centerToScreen(this);
-            this->show();
 //            this->m_searchLineEdit->focusIn(); //打开主界面时输入框夺焦，可直接输入
             this->raise();
             this->activateWindow();
@@ -421,7 +421,12 @@ void MainWindow::centerToScreen(QWidget* widget) {
 //        desk_x = width;
 //        desk_y = height;
 //    }
-    widget->move(desk_x / 2 - x / 2 + desk_rect.left(), desk_y / 3 + desk_rect.top());
+    widget->show();
+    kdk::WindowManager::setGeometry(this->windowHandle(),QRect(desk_x / 2 - x / 2 + desk_rect.left(),
+                                               desk_y / 3 + desk_rect.top(),
+                                               this->width(),
+                                               this->height()));
+//    widget->move(desk_x / 2 - x / 2 + desk_rect.left(), desk_y / 3 + desk_rect.top());
 }
 
 void MainWindow::initGsettings() {
@@ -460,6 +465,7 @@ void MainWindow::initTimer() {
     connect(m_askTimer, &QTimer::timeout, this, [ = ]() {
         if(this->isVisible()) {
             m_isAskDialogVisible = true;
+            kdk::UkuiStyleHelper::self()->removeHeader(m_askDialog);
             m_askDialog->show();
             m_currentSearchAsked = true;
         }