Merge branch 'upstream' of gitee.com:openkylin/ukui-menu into openkylin/yangtze

src/BackProcess/Interface/ukuimenuinterface.cpp

@@ -375,7 +375,7 @@ QStringList UkuiMenuInterface::getDesktopFilePath()
         m_filePathList.removeAll("/usr/share/applications/kylin-io-monitor.desktop");
         m_filePathList.removeAll("/usr/share/applications/wps-office-uninstall.desktop");
         m_filePathList.removeAll("/usr/share/applications/wps-office-misc.desktop");
-        m_filePathList.removeAll("/usr/share/applications/kylin-installer.desktop");
+//        m_filePathList.removeAll("/usr/share/applications/kylin-installer.desktop");
         QStringList desktopList;
 
         for (int i = 0; i < m_filePathList.count(); ++i) {

src/UserInterface/Widget/full_commonuse_widget.cpp

@@ -170,7 +170,7 @@ void FullCommonUseWidget::resizeScrollAreaControls()
         rowcount = listview->model()->rowCount() / dividend;
     }
 
-    listview->setFixedSize(m_listView->width(), listview->gridSize().height() * rowcount);
+    listview->setFixedSize(Style::m_applistAreaWidth, listview->gridSize().height() * rowcount);
     m_scrollArea->widget()->setFixedSize(listview->size());
 }
 
@@ -275,11 +275,13 @@ void FullCommonUseWidget::updateListView()
 void FullCommonUseWidget::repaintWidget()
 {
     m_scrollArea->setFixedSize(Style::m_applistAreaWidth, Style::m_applistWidHeight);
+    m_scrollArea->setWidgetResizable(true);
     m_scrollAreaWidLayout->removeWidget(m_listView);
     m_listView->setParent(nullptr);
     delete m_listView;
     initAppListWidget();
     fillAppList();
+    m_scrollAreaWid->adjustSize();
     m_scrollAreaWidHeight  = m_scrollAreaWid->height();
     initVerticalScrollBar();
     on_setAreaScrollBarValue(0);

src/UserInterface/mainwindow.cpp

@@ -1382,8 +1382,14 @@ void MainWindow::repaintWidget()
     int y = Style::m_primaryScreenY;
     int width = Style::m_availableScreenWidth;
     int height = Style::m_availableScreenHeight;
+
     setMinWindowPos();
+
+    if (g_platform.startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
+        kdk::WindowManager::setGeometry(m_fullWindow->windowHandle(), QRect(x, y, width, height));
+    } else {
         m_fullWindow->move(x, y);
+    }
     m_fullWindow->setFixedSize(width, height);
     m_fullWindow->repaintWidget();
 }

src/UtilityFunction/utility.cpp

@@ -138,23 +138,24 @@ QVariantList getScreenGeometryList()
     QRect rect;
     rect = qApp->primaryScreen()->geometry();
     int panelSize = 0;
-    int position = 0;
+    int panelPosition = 0;
     QVariantList list;
     list.clear();
-    QDBusInterface iface(DBUS_NAME,
-                         DBUS_PATH,
-                         DBUS_INTERFACE,
-                         QDBusConnection::sessionBus());
-    QDBusReply<QVariantList> reply = iface.call("GetPrimaryScreenPhysicalGeometry");
 
-    if (reply.isValid()) {
-        panelSize = reply.value().at(4).toInt();
-        position = reply.value().at(5).toInt();
+    if (QGSettings::isSchemaInstalled(QString("org.ukui.panel.settings").toLocal8Bit())) {
+        QGSettings gsetting(QString("org.ukui.panel.settings").toLocal8Bit());
+        if (gsetting.keys().contains("panelposition")) {
+            panelPosition = gsetting.get("panelposition").toInt();
+        }
+
+        if (gsetting.keys().contains("panelsize")) {
+            panelSize = gsetting.get("panelsize").toInt();
+        }
     }
 
     QList<int> posIndex;
 
-    switch (position) {
+    switch (panelPosition) {
         case BOTTOM:
             posIndex = {0, 0, 0, -1};
             break;
@@ -173,7 +174,7 @@ QVariantList getScreenGeometryList()
     list.append(rect.width() + posIndex[2] * panelSize);
     list.append(rect.height() + posIndex[3] * panelSize);
     list.append(panelSize);
-    list.append(position);
+    list.append(panelPosition);
     return list;
 }