Skip to content

Commit 7b4cd8b

Browse files
ut003640deepin-bot[bot]
authored andcommitted
fix: fix incomplete display
there is extra spacing in the layout, causing display issues. Log: fix incomplete display PMS: BUG-353585 fix: 修复显示不全 布局中多了间距,显示有问题 Log: 修复显示不全
1 parent cb85a2a commit 7b4cd8b

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

dock-network-plugin/dockcontentwidget.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ class DockContentWidget : public QWidget
5555
buttonWidget->setLayout(buttonLayout);
5656

5757
m_mainLayout->setContentsMargins(0, 10, 0, 0);
58+
m_mainLayout->setSpacing(0);
5859
m_mainLayout->addWidget(m_netView, 0, Qt::AlignTop | Qt::AlignHCenter);
59-
m_mainLayout->addStretch();
60-
m_mainLayout->addSpacing(10);
6160
m_mainLayout->addWidget(buttonWidget, 0, Qt::AlignBottom);
6261
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
6362
setMaximumHeight(Dock::DOCK_POPUP_WIDGET_MAX_HEIGHT);

dock-network-plugin/networkplugin.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -385,12 +385,6 @@ QString NetworkPlugin::message(const QString &msg)
385385
}
386386

387387
const auto &msgObj = resultDoc.object();
388-
if (msgObj.value(Dock::MSG_TYPE).toString() == Dock::MSG_SET_APPLET_MIN_HEIGHT) {
389-
const int minHeight = msgObj.value(Dock::MSG_DATA).toInt(-1);
390-
if (m_dockContentWidget && minHeight > 0)
391-
m_dockContentWidget->setMinHeight(minHeight);
392-
}
393-
394388
if (msgObj.value(Dock::MSG_TYPE).toString() == Dock::MSG_APPLET_CONTAINER && m_dockContentWidget) {
395389
m_dockContentWidget->setMainLayoutMargins(QMargins(0, msgObj.value(Dock::MSG_DATA).toInt(-1) ==
396390
Dock::APPLET_CONTAINER_QUICK_PANEL ? 6 : 10, 0, 0));

0 commit comments

Comments
 (0)