diff --git a/dock-network-plugin/dockcontentwidget.h b/dock-network-plugin/dockcontentwidget.h index c33cb76a..957769d5 100644 --- a/dock-network-plugin/dockcontentwidget.h +++ b/dock-network-plugin/dockcontentwidget.h @@ -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); diff --git a/dock-network-plugin/networkplugin.cpp b/dock-network-plugin/networkplugin.cpp index d11d72e3..07090f85 100644 --- a/dock-network-plugin/networkplugin.cpp +++ b/dock-network-plugin/networkplugin.cpp @@ -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 @@ -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));