diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-12 22:08:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-12 22:08:11 +0100 |
commit | 3c54aa37b1cd7d6e5e37d9f0cb5f643551735845 (patch) | |
tree | 85f658ff72aa6c23d2181a3ab80db8d5b753d76d /src | |
parent | Merge pull request #261 from meetfranz/feature/branding (diff) | |
parent | Merge branch 'develop' into feature/mute-service (diff) | |
download | ferdium-app-3c54aa37b1cd7d6e5e37d9f0cb5f643551735845.tar.gz ferdium-app-3c54aa37b1cd7d6e5e37d9f0cb5f643551735845.tar.zst ferdium-app-3c54aa37b1cd7d6e5e37d9f0cb5f643551735845.zip |
Merge pull request #263 from meetfranz/feature/mute-service
minor improvements & bugfixing
Diffstat (limited to 'src')
-rw-r--r-- | src/config.js | 2 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 8 | ||||
-rw-r--r-- | src/styles/tabs.scss | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/config.js b/src/config.js index 1627993f5..10359f426 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -7,7 +7,7 @@ export const GA_ID = 'UA-74126766-6'; | |||
7 | export const DEFAULT_APP_SETTINGS = { | 7 | export const DEFAULT_APP_SETTINGS = { |
8 | autoLaunchOnStart: true, | 8 | autoLaunchOnStart: true, |
9 | autoLaunchInBackground: false, | 9 | autoLaunchInBackground: false, |
10 | runInBackground: false, | 10 | runInBackground: true, |
11 | enableSystemTray: true, | 11 | enableSystemTray: true, |
12 | minimizeToSystemTray: false, | 12 | minimizeToSystemTray: false, |
13 | showDisabledServices: true, | 13 | showDisabledServices: true, |
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 331df5c15..ad3c53ccf 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -35,9 +35,13 @@ export default class SettingsStore extends Store { | |||
35 | 35 | ||
36 | @action async _update({ settings }) { | 36 | @action async _update({ settings }) { |
37 | await this.updateSettingsRequest.execute(settings)._promise; | 37 | await this.updateSettingsRequest.execute(settings)._promise; |
38 | await this.allSettingsRequest.invalidate({ immediately: true }); | 38 | this.allSettingsRequest.patch((result) => { |
39 | if (!result) return; | ||
40 | Object.assign(result, settings); | ||
41 | }); | ||
39 | 42 | ||
40 | this._shareSettingsWithMainProcess(); | 43 | // We need a little hack to wait until everything is patched |
44 | setTimeout(() => this._shareSettingsWithMainProcess(), 0); | ||
41 | 45 | ||
42 | gaEvent('Settings', 'update'); | 46 | gaEvent('Settings', 'update'); |
43 | } | 47 | } |
diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss index 8347de3b4..3ffc53558 100644 --- a/src/styles/tabs.scss +++ b/src/styles/tabs.scss | |||
@@ -67,8 +67,8 @@ | |||
67 | padding: 0px 5px; | 67 | padding: 0px 5px; |
68 | font-size: 11px; | 68 | font-size: 11px; |
69 | position: absolute; | 69 | position: absolute; |
70 | right: 5px; | 70 | right: 8px; |
71 | bottom: 5px; | 71 | bottom: 8px; |
72 | display: flex; | 72 | display: flex; |
73 | justify-content: center; | 73 | justify-content: center; |
74 | align-items: center; | 74 | align-items: center; |