Skip to content

fix: remove minHeight reset and add minHeight message handling #548

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
wjyrich merged 1 commit into from
Apr 22, 2026
Merged

fix: remove minHeight reset and add minHeight message handling #548

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
1 change: 0 additions & 1 deletion dock-network-plugin/dockcontentwidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ public Q_SLOTS:
void hideEvent(QHideEvent *event) override
{
QWidget::hideEvent(event);
m_minHeight = -1;
// 隐藏时更新尺寸为折叠状态，确保下次显示时初始尺寸正确
QMetaObject::invokeMethod(this, "updateSize", Qt::QueuedConnection);
}
Expand Down
7 changes: 7 additions & 0 deletions dock-network-plugin/networkplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,13 @@ 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