From e4bf7ce3a1a3e264c919f45b15899b5e132e9d64 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Mon, 17 Jan 2022 15:00:07 +0200 Subject: [PATCH] QmlDesigner: Remove docking widgets top right controls Fixes: QDS-5983 Change-Id: I3d7b7c33816de69351134c3ad3e4b65d89f6c0cf Reviewed-by: Samuel Ghinet Reviewed-by: Miikka Heikkinen --- src/plugins/qmldesigner/designmodewidget.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 20fee2e3e18..8c5dccd2034 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -231,6 +231,9 @@ void DesignModeWidget::setup() ADS::DockManager::setConfigFlags(ADS::DockManager::DefaultNonOpaqueConfig); ADS::DockManager::setConfigFlag(ADS::DockManager::FocusHighlighting, true); + ADS::DockManager::setConfigFlag(ADS::DockManager::DockAreaHasCloseButton, false); + ADS::DockManager::setConfigFlag(ADS::DockManager::DockAreaHasUndockButton, false); + ADS::DockManager::setConfigFlag(ADS::DockManager::DockAreaHasTabsMenuButton, false); ADS::DockManager::setConfigFlag(ADS::DockManager::OpaqueSplitterResize, true); ADS::DockManager::setConfigFlag(ADS::DockManager::AllTabsHaveCloseButton, true); m_dockManager = new ADS::DockManager(this); @@ -251,10 +254,6 @@ void DesignModeWidget::setup() const QString fontName = "qtds_propertyIconFont.ttf"; const QSize size = QSize(28, 28); - const QIcon closeIcon = Utils::StyleHelper::getIconFromIconFont(fontName, closeUnicode, 28, 28, iconColor); - const QIcon menuIcon = Utils::StyleHelper::getIconFromIconFont(fontName, menuUnicode, 28, 28, iconColor); - const QIcon undockIcon = Utils::StyleHelper::getIconFromIconFont(fontName, undockUnicode, 28, 28, iconColor); - auto tabCloseIconNormal = Utils::StyleHelper::IconFontHelper( closeUnicode, Theme::getColor(Theme::DStabInactiveIcon), size, QIcon::Normal, QIcon::Off); auto tabCloseIconActive = Utils::StyleHelper::IconFontHelper( @@ -268,10 +267,6 @@ void DesignModeWidget::setup() tabCloseIconFocus}); ADS::DockManager::iconProvider().registerCustomIcon(ADS::TabCloseIcon, tabsCloseIcon); - ADS::DockManager::iconProvider().registerCustomIcon(ADS::DockAreaMenuIcon, menuIcon); - ADS::DockManager::iconProvider().registerCustomIcon(ADS::DockAreaUndockIcon, undockIcon); - ADS::DockManager::iconProvider().registerCustomIcon(ADS::DockAreaCloseIcon, closeIcon); - ADS::DockManager::iconProvider().registerCustomIcon(ADS::FloatingWidgetCloseIcon, closeIcon); // Setup Actions and Menus Core::ActionContainer *mview = Core::ActionManager::actionContainer(Core::Constants::M_VIEW);