jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-07-27 05:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1223: use theme service on settings load (#1238)

Browse Source 
* use theme service on settings load

* use window.matchMedia in loadSettings

* typo fix

* Patched app config to dispatch on OS' theme.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Co-authored-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Dave Simpson 2022-07-27 11:06:48 +02:00 committed by GitHub
parent 9373a0bcaf
commit f22be3c587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arduino-ide-extension/src/browser/dialogs/settings/settings.ts
View File

@ -139,7 +139,10 @@ export class SettingsService {
this.preferenceService.get<number>(FONT_SIZE_SETTING, 12), this.preferenceService.get<number>(FONT_SIZE_SETTING, 12),
this.preferenceService.get<string>( this.preferenceService.get<string>(
'workbench.colorTheme', 'workbench.colorTheme',
'arduino-theme' window.matchMedia &&
window.matchMedia('(prefers-color-scheme: dark)').matches
? 'arduino-theme-dark'
: 'arduino-theme'
), ),
this.preferenceService.get<Settings.AutoSave>( this.preferenceService.get<Settings.AutoSave>(
AUTO_SAVE_SETTING, AUTO_SAVE_SETTING,

19
electron/build/patch/frontend/index.js
View File

@ -13,6 +13,9 @@ const {
const { const {
ApplicationProps, ApplicationProps,
} = require('@theia/application-package/lib/application-props'); } = require('@theia/application-package/lib/application-props');
const {
FrontendApplicationConfigProvider,
} = require('@theia/core/lib/browser/frontend-application-config-provider');
const lightTheme = 'arduino-theme'; const lightTheme = 'arduino-theme';
const darkTheme = 'arduino-theme-dark'; const darkTheme = 'arduino-theme-dark';
@ -21,13 +24,19 @@ const defaultTheme =
? darkTheme ? darkTheme
: lightTheme; : lightTheme;
const originalGet = FrontendApplicationConfigProvider.get;
FrontendApplicationConfigProvider.get = function () {
const originalProps = originalGet.bind(FrontendApplicationConfigProvider)();
return { ...originalProps, defaultTheme };
}.bind(FrontendApplicationConfigProvider);
const arduinoDarkTheme = { const arduinoDarkTheme = {
id: 'arduino-theme-dark', id: 'arduino-theme-dark',
type: 'dark', type: 'dark',
label: 'Dark (Arduino)', label: 'Dark (Arduino)',
editorTheme: 'arduino-theme-dark', editorTheme: 'arduino-theme-dark',
activate() {}, activate() {},
deactivate() { } deactivate() {},
}; };
const arduinoLightTheme = { const arduinoLightTheme = {
@ -36,7 +45,7 @@ const arduinoLightTheme = {
label: 'Light (Arduino)', label: 'Light (Arduino)',
editorTheme: 'arduino-theme', editorTheme: 'arduino-theme',
activate() {}, activate() {},
deactivate() { } deactivate() {},
}; };
if (!window[ThemeServiceSymbol]) { if (!window[ThemeServiceSymbol]) {
@ -49,7 +58,11 @@ if (!window[ThemeServiceSymbol]) {
); );
}, },
}); });
themeService.register(...BuiltinThemeProvider.themes, arduinoDarkTheme, arduinoLightTheme); themeService.register(
...BuiltinThemeProvider.themes,
arduinoDarkTheme,
arduinoLightTheme
);
themeService.startupTheme(); themeService.startupTheme();
themeService.setCurrentTheme(defaultTheme); themeService.setCurrentTheme(defaultTheme);
window[ThemeServiceSymbol] = themeService; window[ThemeServiceSymbol] = themeService;