预览和实际屏保文字均无气泡边框

src/common/definetypes.h

@@ -174,6 +174,8 @@ typedef enum _LOCK_CMD_ID_e
 #define GLIB_KEY_SYSTEM_FONT_SIZE "system-font-size"
 #define KEY_THEME_COLOR "themeColor"
 #define KEY_SYSTEM_FONT "systemFont"
+#define KEY_MENU_TRANSPARENCY "menuTransparency"
+#define KEY_STYLE_NAME "styleName"
 
 #define GSETTINGS_SCHEMA_SESSION "org.ukui.session"
 #define KEY_SESSION_IDLE "idleDelay"

src/lock-backend/gsettingshelper.cpp

@@ -214,6 +214,12 @@ bool GSettingsHelper::initThemeStyle()
             if (keys.contains(KEY_THEME_COLOR)) {
                 m_strThemeColor = m_gsThemeStyle->get(KEY_THEME_COLOR).toString();
             }
+            if (keys.contains(KEY_MENU_TRANSPARENCY)) {
+                m_menuTransparency = m_gsThemeStyle->get(KEY_MENU_TRANSPARENCY).toInt();
+            }
+            if (keys.contains(KEY_STYLE_NAME)) {
+                m_styleName = m_gsThemeStyle->get(KEY_STYLE_NAME).toString();
+            }
         }
     }
     return (bool)(m_gsThemeStyle);
@@ -405,6 +411,10 @@ void GSettingsHelper::onThemeStyleConfigChanged(QString strKey)
         varValue = m_strThemeColor = m_gsThemeStyle->get(KEY_THEME_COLOR).toString();
     } else if (strKey == KEY_SYSTEM_FONT) {
         varValue = m_font = m_gsThemeStyle->get(KEY_SYSTEM_FONT).toString();
+    } else if (strKey == KEY_MENU_TRANSPARENCY) {
+        varValue = m_menuTransparency = m_gsThemeStyle->get(KEY_MENU_TRANSPARENCY).toInt();
+    } else if (strKey == KEY_STYLE_NAME) {
+        varValue = m_styleName = m_gsThemeStyle->get(KEY_STYLE_NAME).toString();
     }
     Q_EMIT themeStyleConfigChanged(strKey, varValue);
 }
@@ -634,6 +644,10 @@ QVariant GSettingsHelper::GetThemeStyleConf(QString strKey)
             varValue = m_lfFontSize;
         } else if (strKey == KEY_THEME_COLOR) {
             varValue = m_strThemeColor;
+        } else if (strKey == KEY_MENU_TRANSPARENCY) {
+            varValue = m_menuTransparency;
+        } else if (strKey == KEY_STYLE_NAME) {
+            varValue = m_styleName;
         }
     }
     return varValue;

src/lock-backend/gsettingshelper.h

@@ -135,6 +135,8 @@ private:
     double m_lfFontSize = 0.0;
     QString m_strThemeColor;
     QString m_font;
+    int m_menuTransparency = 0;
+    QString m_styleName;
 
     int m_nSessionIdle = -1;
     bool m_nSessionLogout = false;

src/screensaver/scconfiguration.cpp

@@ -228,8 +228,7 @@ QString SCConfiguration::getMyText()
 int SCConfiguration::getBlurNumber()
 {
     int blurNum = 50;
-    blurNum = m_helperBackendDbus->getUkccPluginsConf("menuTransparency").toInt();
-    qDebug() << "????nm" << blurNum;
+    blurNum = m_helperBackendDbus->getThemeStyleConf("menuTransparency").toInt();
     return blurNum;
 }
 

src/screensaver/screensaver.cpp

@@ -560,10 +560,15 @@ void Screensaver::resizeEvent(QResizeEvent * /*event*/)
         }
         flag = 1;
 #ifndef USE_INTEL
-        if (myTextWidget) {
-            onBlurNumChanged(blur_Num);
-            onStyleChanged(curStyle);
-            cycleLabel->setFixedSize(5, 5);
+        if(myTextWidget){
+            if(curStyle == "ukui-dark" || curStyle == "ukui-black"){
+                myTextLabel->setStyleSheet(QString("QLabel{font-size: 5px; background: rgba(0, 0, 0, %1); color:#FFFFFF; border-radius: 2px; padding: 4px 8px 4px 8px; border-width: 1px;}").arg(blur_Num * 0.01));
+                cycleLabel->setStyleSheet(QString("QLabel{background: rgba(0, 0, 0, %1); color:#FFFFFF; border-radius:3px}").arg(blur_Num * 0.01));
+            } else{
+                myTextLabel->setStyleSheet(QString("QLabel{font-size: 5px; background: rgba(255, 255, 255, %1); border-radius:2px; padding: 4px 8px 4px 8px; border-width: 1px;}").arg(blur_Num * 0.01));
+                cycleLabel->setStyleSheet(QString("QLabel{background: rgba(255, 255, 255, %1); border-radius:3px}").arg(blur_Num * 0.01));
+            }
+            cycleLabel->setFixedSize(6, 6);
         }
         if (screenLabel)
             screenLabel->adjustSize();