diff --git a/frame/display/displaymanager.cpp b/frame/display/displaymanager.cpp index 969abc6fd..be8beed76 100644 --- a/frame/display/displaymanager.cpp +++ b/frame/display/displaymanager.cpp @@ -255,7 +255,6 @@ void DisplayManager::updateScreenDockInfo() */ void DisplayManager::screenCountChanged() { - qDebug() << __FUNCTION__; // 找到过期的screen指针 QList to_remove_list; for (auto s : m_screens) { @@ -292,8 +291,6 @@ void DisplayManager::screenCountChanged() m_screens.append(s); } - qDebug() << "屏幕数量" << m_screens.count(); - // 屏幕数量发生变化,应该刷新一下任务栏的显示 m_delayTimer->start(); } diff --git a/frame/display/displaymanager.h b/frame/display/displaymanager.h index 739657624..73f5b6b02 100644 --- a/frame/display/displaymanager.h +++ b/frame/display/displaymanager.h @@ -27,9 +27,7 @@ #include "singleton.h" #include "constants.h" -#include #include -#include using DisplayInter = com::deepin::daemon::Display; using namespace Dock; diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp index eca406714..738c843e8 100644 --- a/plugins/network/networkitem.cpp +++ b/plugins/network/networkitem.cpp @@ -1133,14 +1133,9 @@ void NetworkItem::updateMasterControlSwitch() m_switchWiredBtn->blockSignals(false); /* 根据有线适配器启用状态增/删布局中的组件 */ for (WiredItem *wiredItem : m_wiredItems) { - if (!wiredItem) { + if (!wiredItem) continue; - } - if (m_switchWiredBtnState) { - m_wiredLayout->addWidget(wiredItem->itemApplet()); - } else { - m_wiredLayout->removeWidget(wiredItem->itemApplet()); - } + // wiredItem->itemApplet()->setVisible(m_switchWiredBtnState); // TODO wiredItem->setVisible(m_switchWiredBtnState); } @@ -1158,9 +1153,9 @@ void NetworkItem::updateMasterControlSwitch() m_switchWirelessBtn->blockSignals(false); /* 根据无线适配器启用状态增/删布局中的组件 */ for (WirelessItem *wirelessItem : m_wirelessItems) { - if (!wirelessItem) { + if (!wirelessItem) continue; - } + if (m_switchWirelessBtnState) { m_wirelessLayout->addWidget(wirelessItem->itemApplet()); } else {