dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infinite loop in StyleSheetLoader

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-10 20:07:17 +01:00
parent 970dcaf0fd
commit 5746ee74cf
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/stylesheetloader.cpp
View File

@@ -2,6 +2,7 @@
* Strawberry Music Player * Strawberry Music Player
* This file was part of Clementine. * This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com> * Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
* *
* Strawberry is free software: you can redistribute it and/or modify * Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -36,7 +37,7 @@ StyleSheetLoader::StyleSheetLoader(QObject *parent) : QObject(parent) {}
void StyleSheetLoader::SetStyleSheet(QWidget *widget, const QString &filename) { void StyleSheetLoader::SetStyleSheet(QWidget *widget, const QString &filename) {
filenames_[widget] = filename; widgets_[widget] = qMakePair(filename, QString());
widget->installEventFilter(this); widget->installEventFilter(this);
UpdateStyleSheet(widget); UpdateStyleSheet(widget);
@@ -44,17 +45,25 @@ void StyleSheetLoader::SetStyleSheet(QWidget *widget, const QString &filename) {
void StyleSheetLoader::UpdateStyleSheet(QWidget *widget) { void StyleSheetLoader::UpdateStyleSheet(QWidget *widget) {
if (!widget || !filenames_.contains(widget)) return; if (!widget || !widgets_.contains(widget)) return;
QString filename(filenames_[widget]); QString filename(widgets_[widget].first);
QString stylesheet(widgets_[widget].second);
// Load the file // Load the file
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qLog(Warning) << "error opening" << filename; qLog(Error) << "Unable to open" << filename;
return; return;
} }
QString contents(file.readAll()); QTextStream stream(&file);
QString contents;
forever {
QString line = stream.readLine();
contents.append(line);
if (stream.atEnd()) break;
}
file.close();
// Replace %palette-role with actual colours // Replace %palette-role with actual colours
QPalette p(widget->palette()); QPalette p(widget->palette());
@@ -93,12 +102,15 @@ void StyleSheetLoader::UpdateStyleSheet(QWidget *widget) {
contents.replace("macos", "*"); contents.replace("macos", "*");
#endif #endif
if (contents == stylesheet) return;
widget->setStyleSheet(""); widget->setStyleSheet("");
widget->setStyleSheet(contents); widget->setStyleSheet(contents);
widgets_[widget] = qMakePair(filename, contents);
} }
void StyleSheetLoader::ReplaceColor(QString *css, const QString &name, const QPalette &palette, QPalette::ColorRole role) const { void StyleSheetLoader::ReplaceColor(QString *css, const QString name, const QPalette &palette, QPalette::ColorRole role) const {
css->replace("%palette-" + name + "-lighter", palette.color(role).lighter().name(), Qt::CaseInsensitive); css->replace("%palette-" + name + "-lighter", palette.color(role).lighter().name(), Qt::CaseInsensitive);
css->replace("%palette-" + name + "-darker", palette.color(role).darker().name(), Qt::CaseInsensitive); css->replace("%palette-" + name + "-darker", palette.color(role).darker().name(), Qt::CaseInsensitive);
@@ -111,7 +123,7 @@ bool StyleSheetLoader::eventFilter(QObject *obj, QEvent *event) {
if (event->type() != QEvent::PaletteChange) return false; if (event->type() != QEvent::PaletteChange) return false;
QWidget *widget = qobject_cast<QWidget*>(obj); QWidget *widget = qobject_cast<QWidget*>(obj);
if (!widget || !filenames_.contains(widget)) return false; if (!widget || !widgets_.contains(widget)) return false;
UpdateStyleSheet(widget); UpdateStyleSheet(widget);
return false; return false;

5
src/core/stylesheetloader.h
View File

@@ -2,6 +2,7 @@
* Strawberry Music Player * Strawberry Music Player
* This file was part of Clementine. * This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com> * Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
* *
* Strawberry is free software: you can redistribute it and/or modify * Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -46,10 +47,10 @@ class StyleSheetLoader : public QObject {
private: private:
void UpdateStyleSheet(QWidget *widget); void UpdateStyleSheet(QWidget *widget);
void ReplaceColor(QString *css, const QString& name, const QPalette &palette, QPalette::ColorRole role) const; void ReplaceColor(QString *css, const QString name, const QPalette &palette, QPalette::ColorRole role) const;
private: private:
QMap<QWidget *, QString> filenames_; QMap<QWidget*, QPair<QString, QString>> widgets_;
}; };
#endif // STYLESHEETLOADER_H #endif // STYLESHEETLOADER_H