chatterino2
Code Issues

do a full reformat according to our current .clang-format

Browse Source
This commit is contained in:
Rasmus Karlsson
2019-05-10 23:31:10 +02:00
parent fa6c9f2fba
commit 1a7a5409ab
14 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/Theme.cpp
+7 -10
View File
@@ -40,8 +40,7 @@ void Theme::actuallyUpdate(double hue, double multiplier)
this->splits.resizeHandleBackground = QColor(0, 148, 255, 0x50);
// Highlighted Messages: theme support quick-fix
this->messages.backgrounds.highlighted =
QColor("#BD8489");
this->messages.backgrounds.highlighted = QColor("#BD8489");
}
else
{
@@ -52,9 +51,7 @@ void Theme::actuallyUpdate(double hue, double multiplier)
this->splits.resizeHandleBackground = QColor(0, 148, 255, 0x20);
// Highlighted Messages: theme support quick-fix
this->messages.backgrounds.highlighted =
QColor("#4B282C");
this->messages.backgrounds.highlighted = QColor("#4B282C");
}
this->splits.header.background = getColor(0, sat, flat ? 1 : 0.9);
@@ -72,7 +69,7 @@ void Theme::actuallyUpdate(double hue, double multiplier)
";" + "color:" + this->messages.textColors.regular.name() + ";" + //
"selection-background-color:" +
(isLight ? "#68B1FF"
: this->tabs.selected.backgrounds.regular.color().name());
: this->tabs.selected.backgrounds.regular.color().name());
this->splits.input.focusedLine = this->tabs.highlighted.line.regular;
@@ -83,13 +80,13 @@ void Theme::actuallyUpdate(double hue, double multiplier)
this->splits.dropPreviewBorder = QColor(0, 148, 255, 0xff);
// Highlighted Messages
// hidden setting from PR #744 - if set it will overwrite theme color (for now!)
//TODO: implement full theme support
if (getSettings()->highlightColor != "") {
// hidden setting from PR #744 - if set it will overwrite theme color
// TODO: implement full theme support
if (getSettings()->highlightColor != "")
{
this->messages.backgrounds.highlighted =
QColor(getSettings()->highlightColor);
}
}
void Theme::normalizeColor(QColor &color)