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

refactor(network):adjust buttons and state icons alignment

Browse Source 
调整网络插件弹窗按钮和状态图标对齐 task:20299

(cherry picked from commit 63609b333ae0ccfead03a8daff537cfa56546f66)
This commit is contained in:
zhaolong 2020-04-21 11:03:27 +08:00 committed by fpc_diesel
parent 56b512e769
commit 74c15fd364
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/network/item/applet/accesspointwidget.cpp
View File

@ -78,7 +78,7 @@ AccessPointWidget::AccessPointWidget()
infoLayout->addWidget(m_ssidBtn);
// infoLayout->addWidget(m_disconnectBtn);
infoLayout->addWidget(m_stateButton);
infoLayout->addSpacing(10);
infoLayout->addSpacing(3);
infoLayout->setSpacing(0);
infoLayout->setContentsMargins(5, 0, 0, 0);

2
plugins/network/item/applet/devicecontrolwidget.cpp
View File

@ -63,7 +63,7 @@ DeviceControlWidget::DeviceControlWidget(QWidget *parent)
infoLayout->addSpacing(10);
infoLayout->addWidget(m_switchBtn);
infoLayout->setSpacing(0);
infoLayout->setContentsMargins(10, 0, 5, 0);
infoLayout->setContentsMargins(10, 0, 3, 0);
// m_seperator = new HorizontalSeperator;
// m_seperator->setFixedHeight(1);

6
plugins/network/item/applet/wirelesslist.cpp
View File

@ -105,7 +105,7 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
// const int h = -(apw->height() - m_indicator->height()) / 2;
// m_indicator->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(35, h));
const int h = -(apw->height() - m_loadingStat->height()) / 2;
m_loadingStat->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(35, h));
m_loadingStat->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(23, h));
});
QMetaObject::invokeMethod(this, "loadAPList", Qt::QueuedConnection);
@ -291,7 +291,7 @@ void WirelessList::updateAPList()
AccessPointWidget *apw = accessPointWidgetByAp(m_activatingAP);
if (apw) {
const int h = -(apw->height() - m_loadingStat->height()) / 2;
m_loadingStat->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(35, h));
m_loadingStat->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(23, h));
}
}
@ -385,7 +385,7 @@ void WirelessList::updateIndicatorPos()
// const int h = -(apw->height() - m_indicator->height()) / 2;
const int h = -(apw->height() - m_loadingStat->height()) / 2;
m_loadingStat->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(35, h));
m_loadingStat->move(apw->mapTo(this, apw->rect().topRight()) - QPoint(23, h));
m_loadingStat->show();
// m_indicator->play();
m_loadingStat->start();

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

@ -78,7 +78,7 @@ WiredItem::WiredItem(WiredDevice *device, const QString &deviceName, QWidget *pa
itemLayout->addWidget(m_connectedName);
itemLayout->addWidget(m_stateButton);
itemLayout->addWidget(m_loadingStat);
itemLayout->addSpacing(10);
itemLayout->addSpacing(3);
connectionLayout->addLayout(itemLayout);
setLayout(connectionLayout);