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

Fix display of keyboard shortcuts

Browse Source 
Was using wrong foreground color for the "no collision" case.
Fix-up of 963dc84cc5

Fixes: QTCREATORBUG-22333
Change-Id: I5b4934b69bd9ff2002846ffda700673b6e1cab24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Eike Ziller
2019-06-17 09:14:11 +02:00
parent e3690ad7ac
commit e8705deb1c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -552,7 +552,7 @@ bool ShortcutSettingsWidget::markCollisions(ShortcutItem *item)
} }
item->m_item->setForeground(2, hasCollision item->m_item->setForeground(2, hasCollision
? Utils::creatorTheme()->color(Utils::Theme::TextColorError) ? Utils::creatorTheme()->color(Utils::Theme::TextColorError)
: commandList()->palette().window()); : commandList()->palette().windowText());
return hasCollision; return hasCollision;
} }