dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-31 16:31:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with dark themes. Fixes #23

Browse Source
This commit is contained in:
Rafostar
2020-12-07 15:25:10 +01:00
parent cf26486476
commit c80f34f4ab
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
clapper_src/app.js
View File

@@ -94,9 +94,11 @@ class ClapperApp extends Gtk.Application
let gtkSettings = Gtk.Settings.get_default(); let gtkSettings = Gtk.Settings.get_default();
settings.bind( settings.bind(
'dark-theme', gtkSettings, 'dark-theme', gtkSettings,
'gtk_application_prefer_dark_theme', 'gtk-application-prefer-dark-theme',
Gio.SettingsBindFlags.GET Gio.SettingsBindFlags.GET
); );
this._onThemeChanged(gtkSettings);
gtkSettings.connect('notify::gtk-theme-name', this._onThemeChanged.bind(this));
this.windowShowSignal = this.active_window.connect( this.windowShowSignal = this.active_window.connect(
'show', this._onWindowShow.bind(this) 'show', this._onWindowShow.bind(this)
@@ -107,12 +109,28 @@ class ClapperApp extends Gtk.Application
_onWindowShow(window) _onWindowShow(window)
{ {
window.disconnect(this.windowShowSignal); window.disconnect(this.windowShowSignal);
this.windowShowSignal = null; this.windowShowSignal = null;
if(this.playlist.length) { if(this.playlist.length) {
let { player } = window.get_child(); let { player } = window.get_child();
player.set_playlist(this.playlist); player.set_playlist(this.playlist);
} }
}
_onThemeChanged(gtkSettings)
{
const theme = gtkSettings.gtk_theme_name;
debug(`user selected theme: ${theme}`);
if(!theme.endsWith('-dark'))
return;
/* We need to request a default theme with optional dark variant
to make the "gtk_application_prefer_dark_theme" setting work */
const parsedTheme = theme.substring(0, theme.lastIndexOf('-'));
gtkSettings.gtk_theme_name = parsedTheme;
debug(`set theme: ${parsedTheme}`);
} }
}); });