isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Consider color-scheme setting for default stylesheet

Browse Source 
Our own preference - equivalent to AdwStyleManager's color-scheme
property - is expressed via a new session mode property.

The default mode uses 'prefer-dark', gnome-classic is expected
to use 'force-light'.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5545

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2324>
This commit is contained in:
Florian Müllner 2022-06-03 17:21:08 +02:00
parent d76f309dba
commit 878a0af00d
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/ui/main.js
View File

@ -7,7 +7,7 @@
kbdA11yDialog, introspectService, start, pushModal, popModal, kbdA11yDialog, introspectService, start, pushModal, popModal,
activateWindow, moveWindowToMonitorAndWorkspace, activateWindow, moveWindowToMonitorAndWorkspace,
createLookingGlass, initializeDeferredWork, createLookingGlass, initializeDeferredWork,
getThemeStylesheet, setThemeStylesheet, screenshotUI */ getStyleVariant, getThemeStylesheet, setThemeStylesheet, screenshotUI */
const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi; const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
@ -179,6 +179,7 @@ function start() {
sessionMode.connect('updated', _sessionUpdated); sessionMode.connect('updated', _sessionUpdated);
St.Settings.get().connect('notify::high-contrast', _loadDefaultStylesheet); St.Settings.get().connect('notify::high-contrast', _loadDefaultStylesheet);
St.Settings.get().connect('notify::color-scheme', _loadDefaultStylesheet);
// Initialize ParentalControlsManager before the UI // Initialize ParentalControlsManager before the UI
ParentalControlsManager.getDefault(); ParentalControlsManager.getDefault();
@ -419,6 +420,25 @@ function _getStylesheet(name) {
return null; return null;
} }
/** @returns {string} */
function getStyleVariant() {
const {colorScheme} = St.Settings.get();
switch (sessionMode.colorScheme) {
case 'force-dark':
return 'dark';
case 'force-light':
return 'light';
case 'prefer-dark':
return colorScheme === St.SystemColorScheme.PREFER_LIGHT
? 'light' : 'dark';
case 'prefer-light':
return colorScheme === St.SystemColorScheme.PREFER_DARK
? 'dark' : 'light';
default:
return '';
}
}
function _getDefaultStylesheet() { function _getDefaultStylesheet() {
let stylesheet = null; let stylesheet = null;
let name = sessionMode.stylesheetName; let name = sessionMode.stylesheetName;
@ -427,8 +447,11 @@ function _getDefaultStylesheet() {
if (St.Settings.get().high_contrast) if (St.Settings.get().high_contrast)
stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css')); stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css'));
if (stylesheet === null)
stylesheet = _getStylesheet(name.replace('.css', `-${getStyleVariant()}.css`));
if (stylesheet == null) if (stylesheet == null)
stylesheet = _getStylesheet(sessionMode.stylesheetName); stylesheet = _getStylesheet(name);
return stylesheet; return stylesheet;
} }

3
js/ui/sessionMode.js
View File

@ -22,7 +22,8 @@ if (Config.HAVE_NETWORKMANAGER)
const _modes = { const _modes = {
'restrictive': { 'restrictive': {
parentMode: null, parentMode: null,
stylesheetName: 'gnome-shell-dark.css', stylesheetName: 'gnome-shell.css',
colorScheme: 'prefer-dark',
themeResourceName: 'gnome-shell-theme.gresource', themeResourceName: 'gnome-shell-theme.gresource',
hasOverview: false, hasOverview: false,
showCalendarEvents: false, showCalendarEvents: false,