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

Utils: Introduce a convenience function creatorColor()

Browse Source 
... forwarding to creatorTheme()->color(...)

Change-Id: Iefaa043495127b3e500ed225584481d3ec0f8c1f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2024-05-29 11:45:22 +02:00
parent d41f15390f
commit efae651924
100 changed files with 327 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/stylehelper.cpp
View File

@@ -107,7 +107,7 @@ QColor StyleHelper::notTooBrightHighlightColor()
QPalette StyleHelper::sidebarFontPalette(const QPalette &original)
{
QPalette palette = original;
const QColor textColor = creatorTheme()->color(Theme::ProgressBarTitleColor);
const QColor textColor = creatorColor(Theme::ProgressBarTitleColor);
palette.setColor(QPalette::WindowText, textColor);
palette.setColor(QPalette::Text, textColor);
return palette;
@@ -137,7 +137,7 @@ QColor StyleHelper::requestedBaseColor()
QColor StyleHelper::toolbarBaseColor(bool lightColored)
{
if (creatorTheme()->flag(Theme::QDSTheme))
return creatorTheme()->color(Utils::Theme::DStoolbarBackground);
return creatorColor(Utils::Theme::DStoolbarBackground);
else
return StyleHelper::baseColor(lightColored);
}
@@ -194,7 +194,7 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
{
s_requestedBaseColor = newcolor;
const QColor themeBaseColor = creatorTheme()->color(Theme::PanelStatusBarBackgroundColor);
const QColor themeBaseColor = creatorColor(Theme::PanelStatusBarBackgroundColor);
const QColor defaultBaseColor = QColor(DEFAULT_BASE_COLOR);
QColor color;
@@ -366,11 +366,11 @@ void StyleHelper::drawArrow(QStyle::PrimitiveElement element, QPainter *painter,
};
if (!enabled) {
drawCommonStyleArrow(image.rect(), creatorTheme()->color(Theme::IconsDisabledColor));
drawCommonStyleArrow(image.rect(), creatorColor(Theme::IconsDisabledColor));
} else {
if (creatorTheme()->flag(Theme::ToolBarIconShadow))
drawCommonStyleArrow(image.rect().translated(0, devicePixelRatio), toolBarDropShadowColor());
drawCommonStyleArrow(image.rect(), creatorTheme()->color(Theme::IconsBaseColor));
drawCommonStyleArrow(image.rect(), creatorColor(Theme::IconsBaseColor));
}
painter.end();
pixmap = QPixmap::fromImage(image);
@@ -463,9 +463,9 @@ void StyleHelper::drawMinimalArrow(QStyle::PrimitiveElement element, QPainter *p
if (enabled) {
if (creatorTheme()->flag(Theme::ToolBarIconShadow))
drawArrow(image.rect().translated(0, devicePixelRatio), toolBarDropShadowColor());
drawArrow(image.rect(), creatorTheme()->color(Theme::IconsBaseColor));
drawArrow(image.rect(), creatorColor(Theme::IconsBaseColor));
} else {
drawArrow(image.rect(), creatorTheme()->color(Theme::IconsDisabledColor));
drawArrow(image.rect(), creatorColor(Theme::IconsDisabledColor));
}
painter.end();
pixmap = QPixmap::fromImage(image);