noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #744 from Chronophylos/custom-highlight-color

Browse source 
Add hidden setting for highlight color
This commit is contained in:
pajlada 2018-10-05 18:41:31 +00:00 committed by GitHub
parent 39a8e8193c 378ea157a1
commit 57eb8f9eb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/singletons/Settings.hpp
View file

@ -141,6 +141,7 @@ public:
"/highlighting/whisperHighlight/enableSound", false}; "/highlighting/whisperHighlight/enableSound", false};
BoolSetting enableWhisperHighlightTaskbar = { BoolSetting enableWhisperHighlightTaskbar = {
"/highlighting/whisperHighlight/enableTaskbarFlashing", false}; "/highlighting/whisperHighlight/enableTaskbarFlashing", false};
QStringSetting highlightColor = {"/highlighting/color", "#4B282C"};
/// Logging /// Logging
BoolSetting enableLogging = {"/logging/enabled", false}; BoolSetting enableLogging = {"/logging/enabled", false};

2
src/singletons/Theme.cpp
View file

@ -212,7 +212,7 @@ void Theme::actuallyUpdate(double hue, double multiplier)
this->messages.backgrounds.highlighted = this->messages.backgrounds.highlighted =
blendColors(themeColor, this->messages.backgrounds.regular, 0.8); blendColors(themeColor, this->messages.backgrounds.regular, 0.8);
} else { } else {
this->messages.backgrounds.highlighted = QColor(75, 40, 44); this->messages.backgrounds.highlighted = QColor(getSettings()->highlightColor);
} }
this->messages.backgrounds.subscription = this->messages.backgrounds.subscription =

1
src/singletons/Theme.hpp
View file

@ -6,6 +6,7 @@
#include <QBrush> #include <QBrush>
#include <QColor> #include <QColor>
#include <pajlada/settings/setting.hpp> #include <pajlada/settings/setting.hpp>
#include <singletons/Settings.hpp>
namespace chatterino { namespace chatterino {