feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds/dev'

Browse Source 
Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
This commit is contained in:
Tim Jenssen
2023-05-22 19:48:42 +02:00
parent 3dcdbe9069 df7398e2c5
commit 1b6c0ff56c
796 changed files with 27524 additions and 10186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/advanceddockingsystem/dockwidget.cpp
View File

@@ -534,7 +534,17 @@ namespace ADS
QSize DockWidget::minimumSizeHint() const
{
if (d->m_minimumSizeHintMode == DockWidget::MinimumSizeHintFromDockWidget || !d->m_widget)
if (!d->m_widget)
return QSize(60, 40);
DockContainerWidget *container = this->dockContainer();
if (!container || container->isFloating()) {
const QSize sh = d->m_widget->minimumSizeHint();
const QSize s = d->m_widget->minimumSize();
return {std::max(s.width(), sh.width()), std::max(s.height(), sh.height())};
}
if (d->m_minimumSizeHintMode == DockWidget::MinimumSizeHintFromDockWidget)
return QSize(60, 40);
else
return d->m_widget->minimumSizeHint();