chatterino2
Code Issues

fixed brown header when hovering in light theme

Browse Source
This commit is contained in:
fourtf
2017-12-26 15:08:36 +01:00
parent a9b24c30d9
commit 37ca3cd79e
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/colorscheme.cpp
+13 -13
View File
@@ -74,7 +74,7 @@ void ColorScheme::setColors(double hue, double multiplier)
TabBackground = QColor(255, 255, 255); TabBackground = QColor(255, 255, 255);
TabHoverText = QColor(0, 0, 0); TabHoverText = QColor(0, 0, 0);
TabHoverBackground = getColor(hue, 0, 0.05); TabHoverBackground = QColor::fromHslF(hue, 0, 0.95);
} else { } else {
// Ubuntu style // Ubuntu style
// TODO: add setting for this // TODO: add setting for this
@@ -86,15 +86,15 @@ void ColorScheme::setColors(double hue, double multiplier)
} }
TabSelectedText = QColor(255, 255, 255); TabSelectedText = QColor(255, 255, 255);
TabSelectedBackground = getColor(hue, 0.5, 0.5); TabSelectedBackground = QColor::fromHslF(hue, 0.5, 0.5);
TabSelectedUnfocusedText = QColor(255, 255, 255); TabSelectedUnfocusedText = QColor(255, 255, 255);
TabSelectedUnfocusedBackground = getColor(hue, 0, 0.5); TabSelectedUnfocusedBackground = QColor::fromHslF(hue, 0, 0.5);
TabHighlightedText = QColor(0, 0, 0); TabHighlightedText = QColor(0, 0, 0);
TabHighlightedBackground = getColor(hue, 0.5, 0.2); TabHighlightedBackground = QColor::fromHslF(hue, 0.5, 0.8);
TabNewMessageBackground = QBrush(getColor(hue, 0.5, 0.2), Qt::DiagCrossPattern); TabNewMessageBackground = QBrush(QColor::fromHslF(hue, 0.5, 0.8), Qt::DiagCrossPattern);
// Chat // Chat
ChatBackground = getColor(0, 0.1, 1); ChatBackground = getColor(0, 0.1, 1);
@@ -139,10 +139,10 @@ void ColorScheme::normalizeColor(QColor &color)
} }
if (color.lightnessF() > 0.4f && color.hueF() > 0.1 && color.hueF() < 0.33333) { if (color.lightnessF() > 0.4f && color.hueF() > 0.1 && color.hueF() < 0.33333) {
color.setHslF(color.hueF(), color.saturationF(), color.setHslF(
color.lightnessF() - color.hueF(), color.saturationF(),
sin((color.hueF() - 0.1) / (0.3333 - 0.1) * 3.14159) * color.lightnessF() - sin((color.hueF() - 0.1) / (0.3333 - 0.1) * 3.14159) *
color.saturationF() * 0.2); color.saturationF() * 0.2);
} }
} else { } else {
if (color.lightnessF() < 0.5f) { if (color.lightnessF() < 0.5f) {
@@ -150,10 +150,10 @@ void ColorScheme::normalizeColor(QColor &color)
} }
if (color.lightnessF() < 0.6f && color.hueF() > 0.54444 && color.hueF() < 0.83333) { if (color.lightnessF() < 0.6f && color.hueF() > 0.54444 && color.hueF() < 0.83333) {
color.setHslF(color.hueF(), color.saturationF(), color.setHslF(
color.lightnessF() + color.hueF(), color.saturationF(),
sin((color.hueF() - 0.54444) / (0.8333 - 0.54444) * 3.14159) * color.lightnessF() + sin((color.hueF() - 0.54444) / (0.8333 - 0.54444) * 3.14159) *
color.saturationF() * 0.4); color.saturationF() * 0.4);
} }
} }
} }
src/windowmanager.cpp
+1
View File
@@ -68,6 +68,7 @@ widgets::Window &WindowManager::getSelectedWindow()
widgets::Window &WindowManager::createWindow() widgets::Window &WindowManager::createWindow()
{ {
auto *window = new widgets::Window("external", this->channelManager, this->colorScheme, false); auto *window = new widgets::Window("external", this->channelManager, this->colorScheme, false);
window->getNotebook().addNewPage();
this->windows.push_back(window); this->windows.push_back(window);