fix: jump problem

Description: 解决跳转管控问题

Log: 解决跳转管控问题

debian/changelog

@@ -1,3 +1,12 @@
+ukui-control-center (3.22.1.25-ok10) v101; urgency=medium
+
+  * 解决跳转管控问题
+  * 需求：无
+  * 任务：无
+  * 其他改动：无
+
+ -- zhoubin <zhoubin@kylinos.cn>  Mon, 09 Jan 2023 18:39:12 +0800
+
 ukui-control-center (3.22.1.25-ok9) v101; urgency=medium
 
   * 切换主题后控制面板窗口自动最小化，几秒后主题变化生效控制面板窗口自动关闭

plugins/system/display/outputconfig.cpp

@@ -199,7 +199,7 @@ void OutputConfig::initUi()
 
     initConnection();
 
-    if (!Common::isOpenkylin() && !Common::isWayland())
+    if (!(Common::isOpenkylin() && Common::isWayland()))
         return;
     // 缩放率下拉框
 

plugins/system/display/qml/Output.qml

@@ -19,6 +19,7 @@
 import QtQuick 2.1
 import QtGraphicalEffects 1.0
 import org.kde.kscreen 1.0
+import org.kde.plasma.components 2.0 as PlasmaComponents
 
 QMLOutput {
 
@@ -204,8 +205,8 @@ QMLOutput {
                 }
             }
 
-            Item {
-                //文字位置
+            PlasmaComponents.Label {
+                id: labelVendor;
                 y: ((parent.height - orientationPanel.height) / 2) - (implicitHeight / 2)
 
                 anchors {
@@ -214,25 +215,21 @@ QMLOutput {
                     leftMargin: 5;
                     rightMargin: 5;
                 }
+                text: if (root.isCloneMode) {
+                        return ("Unity");
+                      } else {
+                        return root.output.name;
+                      }
 
-                Text {
-                    id: labelVendor;
-                    text: if (root.isCloneMode) {
-                            return ("Unity");
-                          } else {
-                            return root.output.name;
-                          }
-
-                    anchors {
-                        verticalCenter: parent.verticalCenter;
-                        left: parent.left;
-                        right: parent.right;
-                    }
-                    horizontalAlignment: Text.AlignHCenter;
-                    color: "#FFFFFF";
-                    font.pixelSize: 12;
-                    elide: Text.ElideRight;
+                anchors {
+                    verticalCenter: parent.verticalCenter;
+                    left: parent.left;
+                    right: parent.right;
                 }
+                horizontalAlignment: Text.AlignHCenter;
+                color: "#FFFFFF";
+                font.pixelSize: 12;
+                elide: Text.ElideRight;
             }
         }
         Item {

plugins/system/display/unifiedoutputconfig.cpp

@@ -222,7 +222,7 @@ void UnifiedOutputConfig::initUi()
         }
     });
 
-    if (!Common::isOpenkylin() && !Common::isWayland())
+    if (!(Common::isOpenkylin() && Common::isWayland()))
         return;
 
     UkccFrame *scaleFrame = new UkccFrame(this, UkccFrame::BorderRadiusStyle::None, true);

plugins/system/display/widget.cpp

@@ -2290,8 +2290,10 @@ void Widget::showBrightnessFrame(const int flag)
     allShowFlag = mIscloneMode;
     if (allShowFlag == true) { //镜像模式/即将成为镜像模式
         for (int i = 0; i < BrightnessFrameV.size(); ++i) {
-            if (!BrightnessFrameV[i]->getOutputEnable())
+            if (!BrightnessFrameV[i]->getOutputEnable()) {
+                BrightnessFrameV[i]->setVisible(false);
                 continue;
+            }
             BrightnessFrameV[i]->setOutputEnable(true);
             //~ contents_path /Display/Brightness
             BrightnessFrameV[i]->setTextLabelName(tr("Brightness") + QString("(") + BrightnessFrameV[i]->getOutputName() + QString(")"));

shell/mainwindow.cpp

@@ -155,7 +155,7 @@ void MainWindow::bootOptionsFilter(QString opt, bool firstIn) {
 
     QMap<QString, QObject *> pluginsObjMap = modulesList.at(moduleNum);
 
-    if (pluginsObjMap.keys().contains(funcStr)){
+    if (pluginsObjMap.keys().contains(funcStr)) {
         if (m_ModuleMap.isEmpty() || m_ModuleMap[funcName.toLower()].toBool()) {
             QString superordinate = "";
             for (auto it : moduleSuperordinate) {
@@ -165,7 +165,7 @@ void MainWindow::bootOptionsFilter(QString opt, bool firstIn) {
                 }
             }
 
-            if (m_ModuleMap.contains(superordinate.toLower()) && m_ModuleMap[superordinate.toLower()].toBool()) {
+            if (m_ModuleMap.isEmpty() || (m_ModuleMap.contains(superordinate.toLower()) && m_ModuleMap[superordinate.toLower()].toBool())) {
                 //开始跳转
                 functionBtnClicked(pluginsObjMap.value(funcStr));
                 return ;
@@ -1242,7 +1242,7 @@ void MainWindow::switchPage(QString moduleName, QString jumpMoudle, QString jump
                     }
                 }
 
-                if (m_ModuleMap.contains(superordinate.toLower()) && m_ModuleMap[superordinate.toLower()].toBool()) {
+                if (m_ModuleMap.isEmpty() || (m_ModuleMap.contains(superordinate.toLower()) && m_ModuleMap[superordinate.toLower()].toBool())) {
                     functionBtnClicked(modules.value(moduleName));
                     return ;
                 }