From 83d40683d903000e484303bd93c08ea81a7cca47 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 23 Mar 2023 15:07:44 +0100 Subject: [PATCH] Core: Fix error text color in SearchResultWidget Remove the CanceledSearchTextColor theme role and use TextColorError instead. Change-Id: I3dde538d107ecfdd9c9a3f2406f6cd26ad28c902 Reviewed-by: David Schulz Reviewed-by: --- share/qtcreator/themes/dark.creatortheme | 1 - share/qtcreator/themes/default.creatortheme | 1 - share/qtcreator/themes/design-light.creatortheme | 1 - share/qtcreator/themes/design.creatortheme | 1 - share/qtcreator/themes/flat-dark.creatortheme | 1 - share/qtcreator/themes/flat-light.creatortheme | 1 - share/qtcreator/themes/flat.creatortheme | 1 - src/libs/utils/theme/theme.h | 1 - src/plugins/coreplugin/find/searchresultwidget.cpp | 2 +- 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index fe8807eab1d..2c00e67971c 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -184,7 +184,6 @@ BadgeLabelBackgroundColorChecked=normalBackground BadgeLabelBackgroundColorUnchecked=selectedBackground BadgeLabelTextColorChecked=text BadgeLabelTextColorUnchecked=text -CanceledSearchTextColor=ff0000 ComboBoxArrowColor=text ComboBoxArrowColorDisabled=text ComboBoxTextColor=text diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index 52101b881bd..7327307c982 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -175,7 +175,6 @@ BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ffff0000 ComboBoxArrowColor=ffb8b5b2 ComboBoxArrowColorDisabled=ffdcdcdc ComboBoxTextColor=ffffffff diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme index f3cf92f58ac..6ffeca69bff 100644 --- a/share/qtcreator/themes/design-light.creatortheme +++ b/share/qtcreator/themes/design-light.creatortheme @@ -189,7 +189,6 @@ BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 ComboBoxArrowColor=toolBarItem ComboBoxArrowColorDisabled=toolBarItemDisabled ComboBoxTextColor=fancyBarsNormalTextColor diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme index 1783ba8e9d0..a3b8425b080 100644 --- a/share/qtcreator/themes/design.creatortheme +++ b/share/qtcreator/themes/design.creatortheme @@ -186,7 +186,6 @@ BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 ComboBoxArrowColor=toolBarItem ComboBoxArrowColorDisabled=toolBarItemDisabled ComboBoxTextColor=fancyBarsNormalTextColor diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 16bf4e26e72..70c86db8f6b 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -188,7 +188,6 @@ BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 ComboBoxArrowColor=toolBarItem ComboBoxArrowColorDisabled=toolBarItemDisabled ComboBoxTextColor=fancyBarsNormalTextColor diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 512f511f735..f378eae16fd 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -184,7 +184,6 @@ BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 ComboBoxArrowColor=toolBarItem ComboBoxArrowColorDisabled=toolBarItemDisabled ComboBoxTextColor=fancyBarsNormalTextColor diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index e0e27654329..7c26e782d12 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -182,7 +182,6 @@ BadgeLabelBackgroundColorChecked=ffe0e0e0 BadgeLabelBackgroundColorUnchecked=ff808080 BadgeLabelTextColorChecked=ff606060 BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 ComboBoxArrowColor=toolBarItem ComboBoxArrowColorDisabled=toolBarItemDisabled ComboBoxTextColor=fancyBarsNormalTextColor diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index d3ba34b3ee5..2652c73b135 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -36,7 +36,6 @@ public: BadgeLabelBackgroundColorUnchecked, BadgeLabelTextColorChecked, BadgeLabelTextColorUnchecked, - CanceledSearchTextColor, ComboBoxArrowColor, ComboBoxArrowColorDisabled, ComboBoxTextColor, diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index 36344ed804d..5959cd40fda 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -93,7 +93,7 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) : topLayout->addWidget(m_topReplaceWidget); m_messageWidget = new QFrame; - pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::CanceledSearchTextColor)); + pal.setColor(QPalette::WindowText, creatorTheme()->color(Theme::TextColorError)); m_messageWidget->setPalette(pal); if (creatorTheme()->flag(Theme::DrawSearchResultWidgetFrame)) { m_messageWidget->setFrameStyle(QFrame::Panel | QFrame::Raised);