Skip to content

fix: fix incomplete display #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Apr 9, 2026
Merged

fix: fix incomplete display #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions dock-network-plugin/dockcontentwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ class DockContentWidget : public QWidget
buttonWidget->setLayout(buttonLayout);

m_mainLayout->setContentsMargins(0, 10, 0, 0);
m_mainLayout->setSpacing(0);
m_mainLayout->addWidget(m_netView, 0, Qt::AlignTop | Qt::AlignHCenter);
m_mainLayout->addStretch();
m_mainLayout->addSpacing(10);
m_mainLayout->addWidget(buttonWidget, 0, Qt::AlignBottom);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setMaximumHeight(Dock::DOCK_POPUP_WIDGET_MAX_HEIGHT);
Expand Down
8 changes: 1 addition & 7 deletions dock-network-plugin/networkplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -385,12 +385,6 @@ QString NetworkPlugin::message(const QString &msg)
}

const auto &msgObj = resultDoc.object();
if (msgObj.value(Dock::MSG_TYPE).toString() == Dock::MSG_SET_APPLET_MIN_HEIGHT) {
const int minHeight = msgObj.value(Dock::MSG_DATA).toInt(-1);
if (m_dockContentWidget && minHeight > 0)
m_dockContentWidget->setMinHeight(minHeight);
}

if (msgObj.value(Dock::MSG_TYPE).toString() == Dock::MSG_APPLET_CONTAINER && m_dockContentWidget) {
m_dockContentWidget->setMainLayoutMargins(QMargins(0, msgObj.value(Dock::MSG_DATA).toInt(-1) ==
Dock::APPLET_CONTAINER_QUICK_PANEL ? 6 : 10, 0, 0));
Expand Down
Loading