diff options
author | 2020-01-31 16:54:14 +0100 | |
---|---|---|
committer | 2020-01-31 16:54:14 +0100 | |
commit | eefda6c7b3e9f0e9b0cfc056efbf59d04a54be85 (patch) | |
tree | 0cc58679ac60afcd2b5f620ce88088644e677bb9 /src/components | |
parent | Add better sync between Ferdi and service dark mode (diff) | |
download | ferdium-app-eefda6c7b3e9f0e9b0cfc056efbf59d04a54be85.tar.gz ferdium-app-eefda6c7b3e9f0e9b0cfc056efbf59d04a54be85.tar.zst ferdium-app-eefda6c7b3e9f0e9b0cfc056efbf59d04a54be85.zip |
Improve dark mode behaviour on macOS
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 9064ff234..61c31ac93 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -170,6 +170,7 @@ export default @observer class EditSettingsForm extends Component { | |||
170 | noUpdates: PropTypes.bool.isRequired, | 170 | noUpdates: PropTypes.bool.isRequired, |
171 | hibernationEnabled: PropTypes.bool.isRequired, | 171 | hibernationEnabled: PropTypes.bool.isRequired, |
172 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 172 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
173 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | ||
173 | openProcessManager: PropTypes.func.isRequired, | 174 | openProcessManager: PropTypes.func.isRequired, |
174 | }; | 175 | }; |
175 | 176 | ||
@@ -194,6 +195,7 @@ export default @observer class EditSettingsForm extends Component { | |||
194 | installUpdate, | 195 | installUpdate, |
195 | form, | 196 | form, |
196 | isCheckingForUpdates, | 197 | isCheckingForUpdates, |
198 | isAdaptableDarkModeEnabled, | ||
197 | isUpdateAvailable, | 199 | isUpdateAvailable, |
198 | noUpdateAvailable, | 200 | noUpdateAvailable, |
199 | updateIsReadyToInstall, | 201 | updateIsReadyToInstall, |
@@ -429,10 +431,10 @@ export default @observer class EditSettingsForm extends Component { | |||
429 | <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2> | 431 | <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2> |
430 | <Toggle field={form.$('showDisabledServices')} /> | 432 | <Toggle field={form.$('showDisabledServices')} /> |
431 | <Toggle field={form.$('showMessageBadgeWhenMuted')} /> | 433 | <Toggle field={form.$('showMessageBadgeWhenMuted')} /> |
432 | <Toggle field={form.$('darkMode')} /> | 434 | {isMac && <Toggle field={form.$('adaptableDarkMode')} />} |
433 | {isDarkmodeEnabled && ( | 435 | {!(isMac && isAdaptableDarkModeEnabled) && <Toggle field={form.$('darkMode')} disabled={isAdaptableDarkModeEnabled} />} |
436 | {(isDarkmodeEnabled || isAdaptableDarkModeEnabled) && ( | ||
434 | <> | 437 | <> |
435 | {isMac && <Toggle field={form.$('adaptableDarkMode')} />} | ||
436 | <Toggle field={form.$('universalDarkMode')} /> | 438 | <Toggle field={form.$('universalDarkMode')} /> |
437 | <p | 439 | <p |
438 | className="settings__message" | 440 | className="settings__message" |