kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor

This commit is contained in:
Mr. Stallion 2021-12-29 14:49:48 -06:00
parent 234d35f15e
commit 06c7b292ee
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electron/Index.vue
View File

@ -296,8 +296,10 @@
Vue.set(core.state, 'generalSettings', this.settings); Vue.set(core.state, 'generalSettings', this.settings);
electron.ipcRenderer.on('settings', electron.ipcRenderer.on('settings', (_e: Event, settings: GeneralSettings) => {
(_e: Event, settings: GeneralSettings) => core.state.generalSettings = this.settings = settings); log.debug('settings.update.index');
core.state.generalSettings = this.settings = settings;
});
electron.ipcRenderer.on('open-profile', (_e: Event, name: string) => { electron.ipcRenderer.on('open-profile', (_e: Event, name: string) => {
const profileViewer = <Modal>this.$refs['profileViewer']; const profileViewer = <Modal>this.$refs['profileViewer'];
@ -486,6 +488,8 @@
getThemeClass(): Record<string, boolean> { getThemeClass(): Record<string, boolean> {
// console.log('getThemeClassIndex', core.state.generalSettings?.risingDisableWindowsHighContrast);
try { try {
return { return {
[`theme-${this.settings.theme}`]: true, [`theme-${this.settings.theme}`]: true,

7
electron/Window.vue
View File

@ -48,7 +48,6 @@
import {GeneralSettings} from './common'; import {GeneralSettings} from './common';
import { getSafeLanguages, updateSupportedLanguages } from './language'; import { getSafeLanguages, updateSupportedLanguages } from './language';
import log from 'electron-log'; import log from 'electron-log';
import core from '../chat/core'; // tslint:disable-line: match-default-export-name
const browserWindow = remote.getCurrentWindow(); const browserWindow = remote.getCurrentWindow();
@ -147,6 +146,8 @@
log.debug('init.window.languages'); log.debug('init.window.languages');
electron.ipcRenderer.on('settings', (_e: Event, settings: GeneralSettings) => { electron.ipcRenderer.on('settings', (_e: Event, settings: GeneralSettings) => {
log.debug('settings.update.window');
this.settings = settings; this.settings = settings;
log.transports.file.level = settings.risingSystemLogLevel; log.transports.file.level = settings.risingSystemLogLevel;
@ -381,10 +382,12 @@
} }
getThemeClass() { getThemeClass() {
// console.log('getThemeClassWindow', this.settings?.risingDisableWindowsHighContrast);
try { try {
return { return {
['platform-' + this.platform]: true, ['platform-' + this.platform]: true,
disableWindowsHighContrast: core.state.generalSettings?.risingDisableWindowsHighContrast || false disableWindowsHighContrast: this.settings?.risingDisableWindowsHighContrast || false
}; };
} catch (err) { } catch (err) {
return { return {