From 397f4054c7dcec35f5b2f3bf18db9dd87ba3dbed Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Fri, 9 Jul 2021 12:25:34 +0200 Subject: [PATCH] QmlDesigner: Fix copy/paste style buttons Task-number: QDS-4697 Change-Id: I689fcfb2d01f4c13f34044ed06ba2babeca0066a Reviewed-by: Alessandro Portale --- .../componentcore/designeractionmanager.cpp | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 369df95a322..77cd00d7fa2 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -1007,20 +1007,32 @@ void DesignerActionManager::createDefaultDesignerActions() &selectionNotEmptyAndHasXorYProperty)); const QString fontName = "qtds_propertyIconFont.ttf"; - const QColor iconColorNormal(Theme::getColor(Theme::IconsBaseColor)); - const QIcon pasteIcon = Utils::StyleHelper::getIconFromIconFont(fontName, - Theme::getIconUnicode( - Theme::Icon::pasteStyle), - 28, - 28, - iconColorNormal); + const QColor iconColorDefault(Theme::getColor(Theme::IconsBaseColor)); + const QColor iconColorDisabled(Theme::getColor(Theme::IconsDisabledColor)); + const QString copyUnicode = Theme::getIconUnicode(Theme::Icon::copyStyle); + const QString pasteUnicode = Theme::getIconUnicode(Theme::Icon::pasteStyle); + const auto copyDefault = Utils::StyleHelper::IconFontHelper(copyUnicode, + iconColorDefault, + QSize(28, 28), + QIcon::Normal); + const auto copyDisabled = Utils::StyleHelper::IconFontHelper(copyUnicode, + iconColorDisabled, + QSize(28, 28), + QIcon::Disabled); const QIcon copyIcon = Utils::StyleHelper::getIconFromIconFont(fontName, - Theme::getIconUnicode( - Theme::Icon::copyStyle), - 28, - 28, - iconColorNormal); + {copyDefault, copyDisabled}); + + const auto pasteDefault = Utils::StyleHelper::IconFontHelper(pasteUnicode, + iconColorDefault, + QSize(28, 28), + QIcon::Normal); + const auto pasteDisabled = Utils::StyleHelper::IconFontHelper(pasteUnicode, + iconColorDisabled, + QSize(28, 28), + QIcon::Disabled); + const QIcon pasteIcon = Utils::StyleHelper::getIconFromIconFont(fontName, + {pasteDefault, pasteDisabled}); addDesignerAction(new ModelNodeAction(copyFormatCommandId, copyFormatDisplayName,