Skip to content

Fix docks becoming "pencil thin" on close and reopen [Port to main] #63

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
mathesoncalum merged 1 commit into from
Jun 2, 2026
Merged

Fix docks becoming "pencil thin" on close and reopen [Port to main] #63

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
2 changes: 1 addition & 1 deletion framework/dockwindow/qml/Muse/Dock/DockPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ DockPanelView {
Loader {
id: contentLoader

active: root.visible
active: root.visible && root.inited
}
}
1 change: 1 addition & 0 deletions framework/dockwindow/qml/Muse/Dock/dockpageview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ void DockPageView::deinit()
TRACEFUNC;

for (DockBase* dock : allDocks()) {
dock->deinit();
dock->disconnect(this);
}
}
Expand Down
23 changes: 11 additions & 12 deletions framework/dockwindow/thirdparty/KDDockWidgets/src/private/quick/QWidgetAdapter_quick.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,22 +627,21 @@ void QWidgetAdapter::move(int x, int y)

void QWidgetAdapter::setSize(QSize size)
{
QSize newSize = size;
#ifdef Q_OS_MACOS
FloatingWindow *floatingWindow = this->floatingWindow();
if (!floatingWindow) {
return;
}

const auto newSize = size.expandedTo(minimumSize());

QWindow* window = floatingWindow->windowHandle();
if (window && window->size() != newSize) {
QRect windowGeo = window->geometry();
windowGeo.setSize(newSize);
window->setGeometry(windowGeo);
if (floatingWindow) {
newSize = size.expandedTo(minimumSize());

QWindow* window = floatingWindow->windowHandle();
if (window && window->size() != newSize) {
QRect windowGeo = window->geometry();
windowGeo.setSize(newSize);
window->setGeometry(windowGeo);
}
}
#endif
QQuickItem::setSize(QSizeF(size));
QQuickItem::setSize(QSizeF(newSize));
}

void QWidgetAdapter::setParent(QQuickItem *p)
Expand Down