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

Auto set brighter sliders on Adwaita dark only

Browse Source
This commit is contained in:
Rafał Dzięgiel
2021-03-24 21:16:41 +01:00
parent b404eb2f56
commit 4a60e01131
5 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
css/styles.css
View File

@@ -61,6 +61,9 @@ radio {
.roundedcorners {
border-radius: 8px;
}
.adwthemedark scale trough highlight {
filter: brightness(120%);
}
.videowidget {
min-width: 320px;
@@ -301,9 +304,6 @@ radio {
.gpufriendlyfs {
box-shadow: none;
}
.brightscale trough highlight {
filter: brightness(120%);
}
/* Error BG */
.blackbackground {

4
data/com.github.rafostar.Clapper.gschema.xml
View File

@@ -84,10 +84,6 @@
<default>true</default>
<summary>Enable to force the app to use dark theme variant</summary>
</key>
<key name="brighter-sliders" type="b">
<default>true</default>
<summary>Enable to make all sliders/bars brighter</summary>
</key>
<key name="render-shadows" type="b">
<default>true</default>
<summary>Enable rendering window shadows (only if theme has them)</summary>

24
src/appBase.js
View File

@@ -33,12 +33,6 @@ class ClapperAppBase extends Gtk.Application
if(!settings.get_boolean('render-shadows'))
window.add_css_class('gpufriendly');
if(
settings.get_boolean('dark-theme')
&& settings.get_boolean('brighter-sliders')
)
window.add_css_class('brightscale');
for(let action in Menu.actions) {
const simpleAction = new Gio.SimpleAction({
name: action
@@ -94,6 +88,7 @@ class ClapperAppBase extends Gtk.Application
{
const theme = gtkSettings.gtk_theme_name;
const window = this.active_window;
const hasAdwThemeDark = window.has_css_class('adwthemedark');
debug(`user selected theme: ${theme}`);
@@ -102,6 +97,17 @@ class ClapperAppBase extends Gtk.Application
if(!window.has_css_class('adwrounded'))
window.add_css_class('adwrounded');
if(theme.startsWith('Adwaita')) {
const isDarkTheme = settings.get_boolean('dark-theme');
if(isDarkTheme && !hasAdwThemeDark)
window.add_css_class('adwthemedark');
else if(!isDarkTheme && hasAdwThemeDark)
window.remove_css_class('adwthemedark');
}
else if(hasAdwThemeDark)
window.remove_css_class('adwthemedark');
if(!theme.endsWith('-dark'))
return;
@@ -123,9 +129,7 @@ class ClapperAppBase extends Gtk.Application
if(!hasAdwIcons)
window.add_css_class('adwicons');
}
else {
if(hasAdwIcons)
window.remove_css_class('adwicons');
}
else if(hasAdwIcons)
window.remove_css_class('adwicons');
}
});

18
src/playerBase.js
View File

@@ -176,27 +176,11 @@ class ClapperPlayerBase extends GstClapper.Clapper
debug(`set subtitle-video offset: ${value}`);
break;
case 'dark-theme':
case 'brighter-sliders':
root = this.widget.get_root();
if(!root || !root.isClapperApp)
break;
const brightClass = 'brightscale';
const isBrighter = root.has_css_class(brightClass);
if(key === 'dark-theme' && isBrighter && !settings.get_boolean(key)) {
root.remove_css_class(brightClass);
debug('remove brighter sliders');
break;
}
const setBrighter = settings.get_boolean('brighter-sliders');
if(setBrighter === isBrighter)
break;
action = (setBrighter) ? 'add' : 'remove';
root[action + '_css_class'](brightClass);
debug(`${action} brighter sliders`);
root.application._onThemeChanged(Gtk.Settings.get_default());
break;
case 'play-flags':
const initialFlags = this.pipeline.flags;

4
src/prefs.js
View File

@@ -329,9 +329,7 @@ class ClapperTweaksPage extends PrefsBase.Grid
super._init();
this.addTitle('Appearance');
const darkCheck = this.addCheckButton('Enable dark theme', 'dark-theme');
const brighterCheck = this.addCheckButton('Make sliders brighter', 'brighter-sliders');
darkCheck.bind_property('active', brighterCheck, 'visible', GObject.BindingFlags.SYNC_CREATE);
this.addCheckButton('Enable dark theme', 'dark-theme');
this.addTitle('Performance');
this.addCheckButton('Render window shadows', 'render-shadows');