chatterino2
Code Issues

added theme selection color

Browse Source
This commit is contained in:
fourtf
2017-01-21 05:42:59 +01:00
parent a114bd1204
commit 9165d5cc2e
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
colorscheme.cpp
+6 -13
View File
@@ -47,12 +47,6 @@ ColorScheme::setColors(float hue, float multiplyer)
ChatInputBorder = getColor(0, 0.1, 0.9); ChatInputBorder = getColor(0, 0.1, 0.9);
// generate color lookuptable // generate color lookuptable
// fillLookupTableValues(0, 0.1, 0.6, 1);
// fillLookupTableValues(0.1, 0.50, 1, 1);
// fillLookupTableValues(0.50, 0.65, 1, 0.5);
// fillLookupTableValues(0.65, 0.83, 0.5, 0.7);
// fillLookupTableValues(0.83, 1, 0.7, 0.6);
fillLookupTableValues(this->middleLookupTable, 0.000, 0.166, 0.66, 0.5); fillLookupTableValues(this->middleLookupTable, 0.000, 0.166, 0.66, 0.5);
fillLookupTableValues(this->middleLookupTable, 0.166, 0.333, 0.5, 0.55); fillLookupTableValues(this->middleLookupTable, 0.166, 0.333, 0.5, 0.55);
fillLookupTableValues(this->middleLookupTable, 0.333, 0.500, 0.55, 0.45); fillLookupTableValues(this->middleLookupTable, 0.333, 0.500, 0.55, 0.45);
@@ -67,13 +61,12 @@ ColorScheme::setColors(float hue, float multiplyer)
fillLookupTableValues(this->minLookupTable, 0.666, 0.833, 0.50, 0.30); fillLookupTableValues(this->minLookupTable, 0.666, 0.833, 0.50, 0.30);
fillLookupTableValues(this->minLookupTable, 0.833, 1.000, 0.30, 0.33); fillLookupTableValues(this->minLookupTable, 0.833, 1.000, 0.30, 0.33);
// for (int i = 0; i < LOOKUP_COLOR_COUNT; i++) { // stylesheet
// qInfo(QString::number(this->middleLookupTable[i]).toStdString().c_str()); InputStyleSheet =
// } "background:" + ChatInputBackground.name() + ";" +
"border:" + TabSelectedBackground.name() + ";" +
InputStyleSheet = "background:" + ChatInputBackground.name() + ";" + "color:" + Text.name() + ";" +
"border:" + TabSelectedBackground.name() + ";" + "selection-background-color:" + TabSelectedBackground.name();
"color:" + Text.name();
} }
void ColorScheme::fillLookupTableValues(qreal (&array)[360], qreal from, void ColorScheme::fillLookupTableValues(qreal (&array)[360], qreal from,
widgets/chatwidgetinput.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ ChatWidgetInput::ChatWidgetInput()
{ {
this->setLayout(&hbox); this->setLayout(&hbox);
this->setMaximumHeight(100); this->setMaximumHeight(150);
this->hbox.addWidget(&edit); this->hbox.addWidget(&edit);
widgets/resizingtextedit.h
+1 -1
View File
@@ -44,7 +44,7 @@ protected:
auto document = this->document()->clone(); auto document = this->document()->clone();
return margins.top() + document->size().height() + margins.bottom() + 2; return margins.top() + document->size().height() + margins.bottom() + 5;
} }
}; };