Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复网络列表分割线问题

Browse Source 
按照设计师进行修改

Log:
Bug: https://pms.uniontech.com/zentao/bug-view-81667.html
Change-Id: I121e98d51b528f9c73c4ea854ce2cb3698982c76
This commit is contained in:
FanPengCheng 2021-05-28 12:23:10 +08:00
parent 44d5672ec6
commit 632cc10cba
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/network/item/wireditem.cpp
View File

@ -37,7 +37,7 @@
DGUI_USE_NAMESPACE
const int ItemHeight = 30;
const int ItemHeight = 36;
extern const QString DarkType = "_dark.svg";
extern const QString LightType = ".svg";
extern void initFontColor(QWidget *widget);

16
plugins/network/networkitem.cpp
View File

@ -24,6 +24,7 @@ const QString MenueWirelessEnable = "wirelessEnable";
const QString MenueSettings = "settings";
#define TITLE_HEIGHT 46
#define ITEM_HEIGHT 36
extern void initFontColor(QWidget *widget)
{
@ -1130,7 +1131,8 @@ void NetworkItem::updateView()
contentHeight += m_wiredControlPanel->height();
m_wiredControlPanel->setVisible(wiredDeviceCnt);
itemCount += wiredDeviceCnt;
if (m_switchWiredBtnState)
itemCount += wiredDeviceCnt;
// 分割线 都有设备时才有
// auto hasDevice = wirelessDeviceCnt && wiredDeviceCnt;
@ -1138,16 +1140,16 @@ void NetworkItem::updateView()
auto centralWidget = m_applet->widget();
if (itemCount <= constDisplayItemCnt) {
contentHeight += (itemCount - wiredDeviceCnt) * ItemHeight;
contentHeight += wiredDeviceCnt * ItemHeight;
contentHeight += (itemCount - wiredDeviceCnt) * ITEM_HEIGHT;
contentHeight += wiredDeviceCnt * ITEM_HEIGHT;
centralWidget->setFixedHeight(contentHeight);
m_applet->setFixedHeight(contentHeight);
} else {
contentHeight += (itemCount - wiredDeviceCnt) * ItemHeight;
contentHeight += wiredDeviceCnt * ItemHeight;
contentHeight += (itemCount - wiredDeviceCnt) * ITEM_HEIGHT;
contentHeight += wiredDeviceCnt * ITEM_HEIGHT;
//加上分割线占用的高度，否则显示界面高度不够显示，会造成无线网络列表item最后一项比其它项的高度小
centralWidget->setFixedHeight(contentHeight + SeparatorItemHeight * 3);
m_applet->setFixedHeight(constDisplayItemCnt * ItemHeight + SeparatorItemHeight * 3);
m_applet->setFixedHeight(constDisplayItemCnt * ITEM_HEIGHT + SeparatorItemHeight * 3);
}
if (m_wirelessControlPanel->isVisible()) {
@ -1200,6 +1202,7 @@ void NetworkItem::updateMasterControlSwitch()
/* 更新有线适配器总开关状态（阻塞信号是为了防止重复设置适配器启用状态）*/
m_switchWiredBtn->blockSignals(true);
m_switchWiredBtn->setChecked(m_switchWiredBtnState);
m_thirdSeparator->setVisible(m_switchWiredBtnState);
m_switchWiredBtn->blockSignals(false);
/* 根据有线适配器启用状态增/删布局中的组件 */
for (WiredItem *wiredItem : m_wiredItems) {
@ -1220,6 +1223,7 @@ void NetworkItem::updateMasterControlSwitch()
/* 更新无线适配器总开关状态（阻塞信号是为了防止重复设置适配器启用状态） */
m_switchWirelessBtn->blockSignals(true);
m_switchWirelessBtn->setChecked(m_switchWirelessBtnState);
m_secondSeparator->setVisible(m_switchWirelessBtnState);
m_switchWirelessBtn->blockSignals(false);
/* 根据无线适配器启用状态增/删布局中的组件 */
for (WirelessItem *wirelessItem : m_wirelessItems) {