Skip to content

[DockWindow V2] Stabilization. Step 2 #151

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

Open
Eism wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[DockWindow V2] Stabilization. Step 2 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac5b75
top toolbar layout fix
Eism Jul 14, 2026
ae677c0
skip applying floating size constraints for undocked frame
Eism Jul 14, 2026
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
4 changes: 4 additions & 0 deletions framework/dockwindow_v2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,8 @@ target_include_directories(muse_dockwindow SYSTEM PRIVATE

if (MUSE_MODULE_DOCKWINDOW_QML)
add_subdirectory(qml/Muse/Dock)

if (MUSE_MODULE_DOCKWINDOW_TESTS)
add_subdirectory(tests)
endif()
endif()
6 changes: 5 additions & 1 deletion framework/dockwindow_v2/internal/dockbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,10 @@ void DockBase::applySizeConstraints()

KDDockWidgets::Core::Group* group = groupForDockWidget(m_dockWidget);

if (m_floating && group && group->isInMainWindow()) {
return;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

if (group) {
group->view()->setMinimumSize(minimumSize);
group->view()->setMaximumSize(maximumSize);
Expand Down Expand Up @@ -835,8 +839,8 @@ void DockBase::updateFloatingStatus()

void DockBase::onIsInMainWindowChanged()
{
applySizeConstraints();
updateFloatingStatus();
applySizeConstraints();
}

void DockBase::doSetFloating(bool floating)
Expand Down
1 change: 1 addition & 0 deletions framework/dockwindow_v2/internal/dockbase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public slots:
protected:
friend class DockWindow;
friend class DropController;
friend class TopLevelToolBarsLayout;

void componentComplete() override;

Expand Down
2 changes: 2 additions & 0 deletions framework/dockwindow_v2/qml/Muse/Dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ qt_add_qml_module(muse_dockwindow_qml
dockwindow.h
foreign.cpp
foreign.h
topleveltoolbarslayout.cpp
topleveltoolbarslayout.h
QML_FILES
DockFloatingWindow.qml
DockFrame.qml
Expand Down
2 changes: 1 addition & 1 deletion framework/dockwindow_v2/qml/Muse/Dock/dockframemodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "dockframemodel.h"

#include <QQuickItem>
#include <QApplication>
#include <QGuiApplication>

#include "kddockwidgets/src/core/Group.h"
#include "kddockwidgets/src/qtquick/views/Group.h"
Expand Down
Loading