!5 修改了platformName获取时机，解决获取为空的问题；增加了全屏窗口显示时位置设置

* update debian/changelog.
* 解决冲突
* 调整platformName获取位置，修改全屏窗口位置设置
* 添加control文件依赖
* 修改图标缺失编译失败问题
* update src/UtilityFunction/abstractInterface.h.
* 3.20wayland位置问题解决

debian/changelog

@@ -1,5 +1,12 @@
-ukui-menu (3.1.1-ok2) yangtze; urgency=medium
+ukui-menu (3.1.1-ok3) yangtze; urgency=medium
 
-  * Initial for openKylin.
+  * 调整QGuiApplication::platformName()调用时机
+  * 增加全屏窗口显示时位置设定
 
- -- lixueman <lixueman@kylinos.cn>  Sat, 18 Jun 2022 21:42:59 +0800
+ -- lixueman <lixueman@kylinos.cn>  Wed, 22 Jun 2022 11:22:58 +0800
+
+ukui-menu (3.1.1-0k0) yangtze; urgency=medium
+
+  * 版本号规范化
+
+ -- Xie Wei <xiewei@kylinos.cn>  Fri, 06 May 2022 17:54:45 +0800:

main.cpp

@@ -44,7 +44,6 @@ int main(int argc, char *argv[])
     initUkuiLog4qt("ukui-menu");
     g_projectCodeName = KDKGetPrjCodeName().c_str();
     g_subProjectCodeName = KDKGetOSRelease("SUB_PROJECT_CODENAME").c_str();
-    g_platform = QGuiApplication::platformName();
 
     qRegisterMetaType<QVector<QStringList>>("QVector<QStringList>");
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
@@ -56,6 +55,7 @@ int main(int argc, char *argv[])
 #endif
     QtSingleApplication app("ukui-menu", argc, argv);
     app.setQuitOnLastWindowClosed(false);
+    g_platform = QGuiApplication::platformName();
 
     if (app.isRunning()) {
         app.sendMessage("raise_window_noop");

src/UserInterface/mainwindow.cpp

@@ -355,6 +355,7 @@ MainWindow::MainWindow(QWidget *parent) :
                 m_viewWidget->setFocus();
             } else {
                 m_fullWindow->show();
+                setMaxWindowPos();
 //                fullWindow->raise();
                 m_fullWindow->activateWindow();
                 pointDataStruct pointData;
@@ -693,6 +694,7 @@ void MainWindow::maxAnimationFinished()
 {
     m_fullWindow->raise();
     m_fullWindow->showNormal();
+    setMaxWindowPos();
     m_fullWindow->activateWindow();
     QEventLoop loop;
     QTimer::singleShot(100, &loop, SLOT(quit()));
@@ -1217,6 +1219,7 @@ void MainWindow::showWindow()
     if (m_isFullScreen) {
         m_fullWindow->raise();
         m_fullWindow->showNormal();
+        setMaxWindowPos();
         m_fullWindow->activateWindow();
         pointDataStruct pointData;
         pointData.module = "fullWindow";
@@ -1238,6 +1241,7 @@ void MainWindow::showWindow()
         BuriedPointDataSend::getInstance()->setPoint(pointData);
     }
 }
+
 void MainWindow::hideWindow()
 {
     if (m_fullWindow->isVisible()) {
@@ -1296,6 +1300,13 @@ void MainWindow::setMinWindowPos()
     }
 }
 
+void MainWindow::setMaxWindowPos()
+{
+    if (g_platform.startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
+        kdk::WindowManager::setGeometry(m_fullWindow->windowHandle(), QRect(0, 0, Style::m_availableScreenWidth, Style::m_availableScreenHeight));
+    }
+}
+
 void MainWindow::repaintWidget()
 {
     Style::initWidStyle();

src/UserInterface/mainwindow.h

@@ -107,6 +107,7 @@ protected:
 
     void setMinWindowPos();
 
+    void setMaxWindowPos();
 public:
 Q_SIGNALS:
     void sendSearchKeyword(QString arg);