Compare commits

...

4 Commits

Author SHA1 Message Date
pineappleEA
3cba78ba2d Midnight Blue Colorful shall inherit Colorful icons 2021-01-27 00:43:14 +02:00
pineappleEA
5076464ab5 Dark Colorful shall inherit Colorful icons 2021-01-27 00:42:24 +02:00
pineappleEA
c6caca16d9 Fix bug on GTK desktop environments
For some reason this makes the entries on the combo-box huge when covered. It was never bold on windows anyways.
2021-01-27 00:40:20 +02:00
pineappleEA
af4eea9259 Point Qt to the theme instead of the location 2021-01-27 00:37:51 +02:00
4 changed files with 4 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
[Icon Theme]
Name=colorful_dark
Comment=Colorful theme (Dark style)
Inherits=default
Inherits=colorful
Directories=16x16
[16x16]

View File

@@ -1,7 +1,7 @@
[Icon Theme]
Name=colorful_midnight_blue
Comment=Colorful theme (Midnight Blue style)
Inherits=default
Inherits=colorful
Directories=16x16
[16x16]

View File

@@ -1257,10 +1257,6 @@ QComboBox::item:alternate {
background: #19232D;
}
QComboBox::item:checked {
font-weight: bold;
}
QComboBox::item:selected {
border: 0px solid transparent;
}

View File

@@ -2927,7 +2927,7 @@ void GMainWindow::filterBarSetChecked(bool state) {
}
void GMainWindow::UpdateUITheme() {
const QString default_icons = QStringLiteral(":/icons/default");
const QString default_icons = QStringLiteral("default");
const QString& current_theme = UISettings::values.theme;
const bool is_default_theme = current_theme == QString::fromUtf8(UISettings::themes[0].second);
QStringList theme_paths(default_theme_paths);
@@ -2943,7 +2943,6 @@ void GMainWindow::UpdateUITheme() {
qApp->setStyleSheet({});
setStyleSheet({});
}
theme_paths.append(default_icons);
QIcon::setThemeName(default_icons);
} else {
const QString theme_uri(QLatin1Char{':'} + current_theme + QStringLiteral("/style.qss"));
@@ -2955,10 +2954,7 @@ void GMainWindow::UpdateUITheme() {
} else {
LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
}
const QString theme_name = QStringLiteral(":/icons/") + current_theme;
theme_paths.append({default_icons, theme_name});
QIcon::setThemeName(theme_name);
QIcon::setThemeName(current_theme);
}
QIcon::setThemeSearchPaths(theme_paths);