diff options
| author | Henning Gruendl <henning.gruendl@qt.io> | 2023-10-12 20:53:39 +0200 |
|---|---|---|
| committer | Henning Gründl <henning.gruendl@qt.io> | 2023-10-24 10:09:11 +0000 |
| commit | 7613710727f4d93d611e0f1f8b82b1bff94a1a4d (patch) | |
| tree | d058c522ef4b13512f4e9e32b790fdfaf1181305 /src/plugins/qmldesignerbase | |
| parent | 3caac7bc674ec56c807794f719f1fbf975a9fcb9 (diff) | |
ADS: Enable minimumSizeHint from content
* Fix minimumSizeHint handling
* Set DockWidget to not force scroll area
* Set background color on dock widgets
* Add setting to activate/deactivate minimumSizeHint handling
* Fix missing ADS changes from last merge
* Fix ADS comments
Task-number: QDS-10925
Change-Id: I7e8e0d2e7c3f9ee6636a2dc0796f6bd1fff3b2ee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'src/plugins/qmldesignerbase')
| -rw-r--r-- | src/plugins/qmldesignerbase/studio/studioquickwidget.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesignerbase/utils/designersettings.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmldesignerbase/utils/designersettings.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmldesignerbase/studio/studioquickwidget.cpp b/src/plugins/qmldesignerbase/studio/studioquickwidget.cpp index b2c55c5b61d..5da9aaec6e2 100644 --- a/src/plugins/qmldesignerbase/studio/studioquickwidget.cpp +++ b/src/plugins/qmldesignerbase/studio/studioquickwidget.cpp @@ -24,6 +24,8 @@ StudioQuickWidget::StudioQuickWidget(QWidget *parent) setLayout(layout); layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_quickWidget); + + setMinimumSize(QSize(100, 100)); // sensible default } QQmlEngine *StudioQuickWidget::engine() const diff --git a/src/plugins/qmldesignerbase/utils/designersettings.cpp b/src/plugins/qmldesignerbase/utils/designersettings.cpp index 8157712437b..248df496081 100644 --- a/src/plugins/qmldesignerbase/utils/designersettings.cpp +++ b/src/plugins/qmldesignerbase/utils/designersettings.cpp @@ -75,6 +75,7 @@ void DesignerSettings::fromSettings(QSettings *settings) restoreValue(settings, DesignerSettingsKey::NAVIGATOR_SHOW_ONLY_VISIBLE_ITEMS, true); restoreValue(settings, DesignerSettingsKey::NAVIGATOR_REVERSE_ITEM_ORDER, false); restoreValue(settings, DesignerSettingsKey::ENABLE_TIMELINEVIEW, true); + restoreValue(settings, DesignerSettingsKey::ENABLE_DOCKWIDGET_CONTENT_MIN_SIZE, true); restoreValue(settings, DesignerSettingsKey::COLOR_PALETTE_RECENT, QStringList()); restoreValue(settings, DesignerSettingsKey::COLOR_PALETTE_FAVORITE, QStringList()); restoreValue(settings, DesignerSettingsKey::ALWAYS_DESIGN_MODE, true); diff --git a/src/plugins/qmldesignerbase/utils/designersettings.h b/src/plugins/qmldesignerbase/utils/designersettings.h index 850e2a43a06..93eab204397 100644 --- a/src/plugins/qmldesignerbase/utils/designersettings.h +++ b/src/plugins/qmldesignerbase/utils/designersettings.h @@ -59,6 +59,7 @@ inline constexpr char IGNORE_DEVICE_PIXEL_RATIO[] = "IgnoreDevicePixelRaio"; /* The settings can be used to turn off the feature, if there are serious issues */ inline constexpr char SHOW_DEBUG_SETTINGS[] = "ShowDebugSettings"; inline constexpr char ENABLE_TIMELINEVIEW[] = "EnableTimelineView"; +inline constexpr char ENABLE_DOCKWIDGET_CONTENT_MIN_SIZE[] = "EnableDockWidgetContentMinSize"; inline constexpr char COLOR_PALETTE_RECENT[] = "ColorPaletteRecent"; inline constexpr char COLOR_PALETTE_FAVORITE[] = "ColorPaletteFavorite"; inline constexpr char ALWAYS_DESIGN_MODE[] = "AlwaysDesignMode"; |