Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to fix crash in setStyleSheet()

Browse Source
This commit is contained in:
Jonas Kvinge 2018-10-26 20:05:37 +02:00
parent 3fe92a62ac
commit 2ba350f76f
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/mainwindow.cpp
View File

@ -857,7 +857,9 @@ void MainWindow::ReloadAllSettings() {
}
void MainWindow::RefreshStyleSheet() {
setStyleSheet(styleSheet());
QString contents(styleSheet());
setStyleSheet("");
setStyleSheet(contents);
}
void MainWindow::MediaStopped() {

1
src/core/stylesheetloader.cpp
View File

@ -93,6 +93,7 @@ void StyleSheetLoader::UpdateStyleSheet(QWidget *widget) {
contents.replace("macos", "*");
#endif
widget->setStyleSheet("");
widget->setStyleSheet(contents);
}

8
src/widgets/fancytabwidget.cpp
View File

@ -362,12 +362,12 @@ void FancyTabWidget::saveSettings(const char *kSettingsGroup) {
}
void FancyTabWidget::addBottomWidget(QWidget* widget) {
bottom_widget_ = widget;
void FancyTabWidget::addBottomWidget(QWidget* widget_view) {
bottom_widget_ = widget_view;
}
int FancyTabWidget::addTab(QWidget *widget, const QIcon &icon, const QString &label) {
return insertTab(count(), widget, icon, label);
int FancyTabWidget::addTab(QWidget *widget_view, const QIcon &icon, const QString &label) {
return insertTab(count(), widget_view, icon, label);
}
int FancyTabWidget::insertTab(int index, QWidget *widget_view, const QIcon &icon, const QString &label) {

6
src/widgets/fancytabwidget.h
View File

@ -42,10 +42,10 @@ class FancyTabWidget : public QTabWidget {
public:
FancyTabWidget(QWidget* parent = 0);
int addTab(QWidget *widget, const QIcon &icon, const QString &label);
int addTab(QWidget *widget_view, const QIcon &icon, const QString &label);
void delTab(const QString &label);
int insertTab(int index, QWidget *widget, const QIcon &icon, const QString &label);
void addBottomWidget(QWidget* widget);
int insertTab(int index, QWidget *widget_view, const QIcon &icon, const QString &label);
void addBottomWidget(QWidget* widget_view);
void setBackgroundPixmap(const QPixmap& pixmap);
void addSpacer();