chatterino2
Code Issues

Merge branch '4tf'

Browse Source
This commit is contained in:
fourtf
2018-08-06 18:41:30 +02:00
parent 43ba408568 35d462d1f1
commit c71795da17
197 changed files with 3807 additions and 2801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/singletons/Fonts.cpp
+5 -15
View File
@@ -29,40 +29,30 @@ Fonts::Fonts()
this->fontsByType_.resize(size_t(EndType));
}
void Fonts::initialize(Application &app)
void Fonts::initialize(Settings &, Paths &)
{
this->chatFontFamily.connect([this, &app](const std::string &, auto) {
this->chatFontFamily.connect([this](const std::string &, auto) {
assertInGuiThread();
if (app.windows) {
app.windows->incGeneration();
}
for (auto &map : this->fontsByType_) {
map.clear();
}
this->fontChanged.invoke();
});
this->chatFontSize.connect([this, &app](const int &, auto) {
this->chatFontSize.connect([this](const int &, auto) {
assertInGuiThread();
if (app.windows) {
app.windows->incGeneration();
}
for (auto &map : this->fontsByType_) {
map.clear();
}
this->fontChanged.invoke();
});
getSettings()->boldScale.connect([this, &app](const int &, auto) {
getSettings()->boldScale.connect([this](const int &, auto) {
assertInGuiThread();
if (app.windows) {
app.windows->incGeneration();
}
getApp()->windows->incGeneration();
for (auto &map : this->fontsByType_) {
map.clear();