Merge branch '2309-0811' into 'yhkylin/v101'

fix(WiFi): wayland浅色主题下托盘WiFi界面图标显示不清晰问题(bug#187464)  & update changelog

See merge request kylinos-src/kylin-nm!246

debian/changelog

@@ -1,3 +1,13 @@
+kylin-nm (3.24.0.0-0k2.14) v101; urgency=medium
+
+  * BUG号:
+     -#187464 【wifi】浅色主题下，首次打开任务栏WiFi界面图标显示不清楚
+  * 需求号：
+  * 其他改动：WiFi连接界面密码框背景色
+  * 影响域：自身
+
+ -- zhangyuanyuan1 <zhangyuanyuan1@kylinos.cn>  Mon, 14 Aug 2023 16:56:33 +0800
+
 kylin-nm (3.24.0.0-0k2.13) v101; urgency=medium
 
   * BUG号:

src/frontend/list-items/listitem.cpp

@@ -334,10 +334,11 @@ void ListItem::onPaletteChanged()
            pal = themePalette(true, this);
        }
     }
+    pal.setColor(QPalette::Base, pal.color(QPalette::Base)); //解决Wayland环境this->setPalette(pal)不生效问题
+
     this->setPalette(pal);
 
     if (m_menu != nullptr) {
-        pal.setColor(QPalette::Base, pal.color(QPalette::Base));
         pal.setColor(QPalette::Text, pal.color(QPalette::Text));
         m_menu->setPalette(pal);
     }

src/frontend/list-items/wlanlistitem.cpp

@@ -255,16 +255,6 @@ void WlanListItem::keyPressEvent(QKeyEvent *event)
     return QFrame::keyPressEvent(event);
 }
 
-void WlanListItem::paintEvent(QPaintEvent *event)
-{
-//    QPalette pal = qApp->palette();
-//    if (m_pwdLineEdit != nullptr) {
-//        pal.setColor(QPalette::Base, pal.color(QPalette::Base));
-//        m_pwdLineEdit->setPalette(pal);
-//    }
-    return QWidget::paintEvent(event);
-}
-
 void WlanListItem::initWlanUI()
 {
     m_hasPwd = (m_wirelessNetItem.m_secuType.isEmpty() || m_wirelessNetItem.m_secuType == "") ? false : true;

src/frontend/list-items/wlanlistitem.h

@@ -90,7 +90,6 @@ protected:
     void leaveEvent(QEvent *event);
     bool eventFilter(QObject *watched, QEvent *event);
     void keyPressEvent(QKeyEvent *event);
-    void paintEvent(QPaintEvent *event);
 
 Q_SIGNALS:
     void itemHeightChanged(const bool isExpanded, const QString &ssid);

src/frontend/tools/infobutton.cpp

@@ -78,6 +78,11 @@ void InfoButton::onPaletteChanged()
            pal = themePalette(true, this);
        }
     }
+    pal.setColor(QPalette::Base, pal.color(QPalette::Base));//解决Wayland环境this->setPalette(pal)不生效问题
+    pal.setColor(QPalette::Text, pal.color(QPalette::Text));
+    pal.setColor(QPalette::Highlight, pal.color(QPalette::Highlight));
+    pal.setColor(QPalette::BrightText, pal.color(QPalette::BrightText));
+
     this->setPalette(pal);
 
     m_foregroundColor = FOREGROUND_COLOR_NORMAL;

src/frontend/tools/radioitembutton.cpp

@@ -154,6 +154,10 @@ void RadioItemButton::onPaletteChanged()
            pal = themePalette(true, this);
        }
     }
+    pal.setColor(QPalette::Base, pal.color(QPalette::Base)); //解决Wayland环境this->setPalette(pal)不生效问题
+    pal.setColor(QPalette::BrightText, pal.color(QPalette::BrightText));
+    pal.setColor(QPalette::Highlight, pal.color(QPalette::Highlight));
+
     this->setPalette(pal);
 
     refreshButtonIcon();