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

TextEditor: Use icons with better contrast in TextMark tooltip

Browse Source 
The "_TOOLBAR" variants do not have a good contrast in some themes. This
also introduces the missing non-toolbar variation for the EYE_OPEN icon.

Fixes: QTCREATORBUG-29087
Change-Id: I64c8c6b7f5696d640c7bea7a431982caacd70050
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Alessandro Portale
2023-04-25 11:22:56 +02:00
parent 89b589c0ea
commit e15b384944
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/utilsicons.cpp
View File

@@ -227,6 +227,8 @@ const Icon INTERRUPT_SMALL_TOOLBAR({
{":/utils/images/interrupt_small.png", Theme::IconsInterruptToolBarColor}}); {":/utils/images/interrupt_small.png", Theme::IconsInterruptToolBarColor}});
const Icon BOUNDING_RECT({ const Icon BOUNDING_RECT({
{":/utils/images/boundingrect.png", Theme::IconsBaseColor}}); {":/utils/images/boundingrect.png", Theme::IconsBaseColor}});
const Icon EYE_OPEN({
{":/utils/images/eye_open.png", Theme::PanelTextColorMid}}, Icon::Tint);
const Icon EYE_OPEN_TOOLBAR({ const Icon EYE_OPEN_TOOLBAR({
{":/utils/images/eye_open.png", Theme::IconsBaseColor}}); {":/utils/images/eye_open.png", Theme::IconsBaseColor}});
const Icon EYE_CLOSED_TOOLBAR({ const Icon EYE_CLOSED_TOOLBAR({

1
src/libs/utils/utilsicons.h
View File

@@ -121,6 +121,7 @@ QTCREATOR_UTILS_EXPORT extern const Icon STOP_SMALL_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon INTERRUPT_SMALL; QTCREATOR_UTILS_EXPORT extern const Icon INTERRUPT_SMALL;
QTCREATOR_UTILS_EXPORT extern const Icon INTERRUPT_SMALL_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon INTERRUPT_SMALL_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon BOUNDING_RECT; QTCREATOR_UTILS_EXPORT extern const Icon BOUNDING_RECT;
QTCREATOR_UTILS_EXPORT extern const Icon EYE_OPEN;
QTCREATOR_UTILS_EXPORT extern const Icon EYE_OPEN_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon EYE_OPEN_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon EYE_CLOSED_TOOLBAR; QTCREATOR_UTILS_EXPORT extern const Icon EYE_CLOSED_TOOLBAR;
QTCREATOR_UTILS_EXPORT extern const Icon REPLACE; QTCREATOR_UTILS_EXPORT extern const Icon REPLACE;

4
src/plugins/texteditor/textmark.cpp
View File

@@ -286,7 +286,7 @@ void TextMark::addToToolTipLayout(QGridLayout *target) const
if (m_category.id.isValid() && !m_lineAnnotation.isEmpty()) { if (m_category.id.isValid() && !m_lineAnnotation.isEmpty()) {
auto visibilityAction = new QAction; auto visibilityAction = new QAction;
const bool isHidden = TextDocument::marksAnnotationHidden(m_category.id); const bool isHidden = TextDocument::marksAnnotationHidden(m_category.id);
visibilityAction->setIcon(Utils::Icons::EYE_OPEN_TOOLBAR.icon()); visibilityAction->setIcon(Utils::Icons::EYE_OPEN.icon());
const QString tooltip = (isHidden ? Tr::tr("Show inline annotations for %1") const QString tooltip = (isHidden ? Tr::tr("Show inline annotations for %1")
: Tr::tr("Temporarily hide inline annotations for %1")) : Tr::tr("Temporarily hide inline annotations for %1"))
.arg(m_category.displayName); .arg(m_category.displayName);
@@ -302,7 +302,7 @@ void TextMark::addToToolTipLayout(QGridLayout *target) const
} }
if (m_settingsPage.isValid()) { if (m_settingsPage.isValid()) {
auto settingsAction = new QAction; auto settingsAction = new QAction;
settingsAction->setIcon(Utils::Icons::SETTINGS_TOOLBAR.icon()); settingsAction->setIcon(Utils::Icons::SETTINGS.icon());
settingsAction->setToolTip(Tr::tr("Show Diagnostic Settings")); settingsAction->setToolTip(Tr::tr("Show Diagnostic Settings"));
QObject::connect(settingsAction, &QAction::triggered, Core::ICore::instance(), QObject::connect(settingsAction, &QAction::triggered, Core::ICore::instance(),
[id = m_settingsPage] { Core::ICore::showOptionsDialog(id); }, [id = m_settingsPage] { Core::ICore::showOptionsDialog(id); },