diff options
author | Mahadevan Sreenivasan <mahadevan_sv@yahoo.com> | 2020-04-09 05:27:58 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-09 00:57:58 +0100 |
commit | 5e5945f591027ce6f160010bbd577b8ae8479035 (patch) | |
tree | 9d34b953d9d7d17b8ee9f275f403f89bd3a41c13 /src/components | |
parent | #304 Add option to show draggable window area (#532) (diff) | |
download | ferdium-app-5e5945f591027ce6f160010bbd577b8ae8479035.tar.gz ferdium-app-5e5945f591027ce6f160010bbd577b8ae8479035.tar.zst ferdium-app-5e5945f591027ce6f160010bbd577b8ae8479035.zip |
Add support for Adaptable Dark Mode on Windows (#548)
- Add support for making adaptable checkbox visible for Windows
- Add support in UIStore to check for theme updated using the nativeTheme.on('update', () => {}) event and update the darkmode properties accordinly.
- Update intl to change text to a more generic wording - "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting"
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 055831e3b..8d93737b8 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -12,7 +12,7 @@ import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer'; | |||
12 | import Input from '../../ui/Input'; | 12 | import Input from '../../ui/Input'; |
13 | 13 | ||
14 | import { FRANZ_TRANSLATION } from '../../../config'; | 14 | import { FRANZ_TRANSLATION } from '../../../config'; |
15 | import { isMac } from '../../../environment'; | 15 | import { isMac, isWindows } from '../../../environment'; |
16 | 16 | ||
17 | const { | 17 | const { |
18 | systemPreferences, | 18 | systemPreferences, |
@@ -405,8 +405,8 @@ export default @observer class EditSettingsForm extends Component { | |||
405 | 405 | ||
406 | <Hr /> | 406 | <Hr /> |
407 | 407 | ||
408 | {isMac && <Toggle field={form.$('adaptableDarkMode')} />} | 408 | {(isMac || isWindows) && <Toggle field={form.$('adaptableDarkMode')} />} |
409 | {!(isMac && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} />} | 409 | {!((isMac || isWindows) && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} />} |
410 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( | 410 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( |
411 | <> | 411 | <> |
412 | <Toggle field={form.$('universalDarkMode')} /> | 412 | <Toggle field={form.$('universalDarkMode')} /> |
@@ -530,9 +530,11 @@ export default @observer class EditSettingsForm extends Component { | |||
530 | 530 | ||
531 | <span className="mdi mdi-github-face" /> | 531 | <span className="mdi mdi-github-face" /> |
532 | <span> | 532 | <span> |
533 | |||
533 | Ferdi is based on | 534 | Ferdi is based on |
534 | {' '} | 535 | {' '} |
535 | <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a> | 536 | <a href="https://github.com/meetfranz/franz" target="_blank">Franz</a> |
537 | |||
536 | , a project published | 538 | , a project published |
537 | under the | 539 | under the |
538 | {' '} | 540 | {' '} |