From ad8131164fe01932ee52e795aa22fcb117922969 Mon Sep 17 00:00:00 2001 From: Jinxujie Date: Sun, 28 Nov 2021 14:54:21 +0800 Subject: [PATCH] Fix:bug https://172.17.50.104/biz/bug-view-92675.html https://172.17.50.104/biz/bug-view-92309.html https://172.17.50.104/biz/bug-view-92235.html --- src/frontend/list-items/wlanlistitem.cpp | 2 +- src/frontend/tab-pages/lanpage.cpp | 3 +++ src/frontend/tools/divider.cpp | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/frontend/list-items/wlanlistitem.cpp b/src/frontend/list-items/wlanlistitem.cpp index b7a21d6a..bb64b9a7 100644 --- a/src/frontend/list-items/wlanlistitem.cpp +++ b/src/frontend/list-items/wlanlistitem.cpp @@ -217,7 +217,7 @@ void WlanListItem::initWlanUI() #define PWD_AREA_HEIGHT 36 #define CONNECT_BUTTON_WIDTH 96 -#define FRAME_CONTENT_MARGINS 56,4,16,4 +#define FRAME_CONTENT_MARGINS 56,0,16,4 #define FRAME_SPACING 8 #define PWD_CONTENT_MARGINS 8,0,34,0 #define SHOW_PWD_BUTTON_SIZE 24,24 diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp index 0a64c5d0..91bed84c 100644 --- a/src/frontend/tab-pages/lanpage.cpp +++ b/src/frontend/tab-pages/lanpage.cpp @@ -34,6 +34,9 @@ LanPage::LanPage(QWidget *parent) : TabPage(parent) initLanArea(); connect(m_activeResourse, &KyActiveConnectResourse::stateChangeReason, this, &LanPage::onConnectionStateChange); + connect(m_activeResourse, &KyActiveConnectResourse::activeConnectRemove, this, [=] (QString activeConnectUuid) { + sendLanStateChangeSignal(activeConnectUuid,Deactivated); + } ); connect(m_connectResourse, &KyConnectResourse::connectionAdd, this, &LanPage::onAddConnection); connect(m_connectResourse, &KyConnectResourse::connectionRemove, this, &LanPage::onRemoveConnection); diff --git a/src/frontend/tools/divider.cpp b/src/frontend/tools/divider.cpp index ffe42053..738f9af5 100644 --- a/src/frontend/tools/divider.cpp +++ b/src/frontend/tools/divider.cpp @@ -11,8 +11,10 @@ Divider::Divider(QWidget * parent) : QFrame(parent) void Divider::paintEvent(QPaintEvent * e) { QPainter p(this); + QColor color; + color.setRgb(77,77,77); p.save(); - p.setBrush(this->palette().color(QPalette::Text)); + p.setBrush(color); p.setPen(Qt::transparent); p.setOpacity(0.3); p.drawRoundedRect(this->rect(), 6, 6);