diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-04-04 21:23:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-04 21:23:38 +0200 |
commit | 1790b795238c2abe832285197cb88c0833bd98ca (patch) | |
tree | 89d4bc3632efc05822c0bec53a883b2d092bfd69 /src/components | |
parent | Fix typo [ci skip] (diff) | |
parent | Merge branch 'master' into release/5.0.0-beta.18 (diff) | |
download | ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.gz ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.tar.zst ferdium-app-1790b795238c2abe832285197cb88c0833bd98ca.zip |
5.0.0 beta.18v5.0.0-beta.18
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 4 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 66aef1730..746775a7f 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -43,6 +43,7 @@ const messages = defineMessages({ | |||
43 | @observer | 43 | @observer |
44 | export default class AppLayout extends Component { | 44 | export default class AppLayout extends Component { |
45 | static propTypes = { | 45 | static propTypes = { |
46 | isFullScreen: PropTypes.bool.isRequired, | ||
46 | sidebar: PropTypes.element.isRequired, | 47 | sidebar: PropTypes.element.isRequired, |
47 | services: PropTypes.element.isRequired, | 48 | services: PropTypes.element.isRequired, |
48 | children: PropTypes.element, | 49 | children: PropTypes.element, |
@@ -69,6 +70,7 @@ export default class AppLayout extends Component { | |||
69 | 70 | ||
70 | render() { | 71 | render() { |
71 | const { | 72 | const { |
73 | isFullScreen, | ||
72 | sidebar, | 74 | sidebar, |
73 | services, | 75 | services, |
74 | children, | 76 | children, |
@@ -90,7 +92,7 @@ export default class AppLayout extends Component { | |||
90 | return ( | 92 | return ( |
91 | <div> | 93 | <div> |
92 | <div className="app"> | 94 | <div className="app"> |
93 | {isWindows && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} | 95 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} |
94 | <div className="app__content"> | 96 | <div className="app__content"> |
95 | {sidebar} | 97 | {sidebar} |
96 | <div className="app__service"> | 98 | <div className="app__service"> |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 72aa5a8af..97f535594 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -76,6 +76,10 @@ const messages = defineMessages({ | |||
76 | id: 'settings.app.currentVersion', | 76 | id: 'settings.app.currentVersion', |
77 | defaultMessage: '!!!Current version:', | 77 | defaultMessage: '!!!Current version:', |
78 | }, | 78 | }, |
79 | enableGPUAccelerationInfo: { | ||
80 | id: 'settings.app.restartRequired', | ||
81 | defaultMessage: '!!!Changes require restart', | ||
82 | }, | ||
79 | }); | 83 | }); |
80 | 84 | ||
81 | @observer | 85 | @observer |
@@ -172,6 +176,8 @@ export default class EditSettingsForm extends Component { | |||
172 | {/* Advanced */} | 176 | {/* Advanced */} |
173 | <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2> | 177 | <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2> |
174 | <Toggle field={form.$('enableSpellchecking')} /> | 178 | <Toggle field={form.$('enableSpellchecking')} /> |
179 | <Toggle field={form.$('enableGPUAcceleration')} /> | ||
180 | <p className="settings__help">{intl.formatMessage(messages.enableGPUAccelerationInfo)}</p> | ||
175 | {/* <Select field={form.$('spellcheckingLanguage')} /> */} | 181 | {/* <Select field={form.$('spellcheckingLanguage')} /> */} |
176 | <div className="settings__settings-group"> | 182 | <div className="settings__settings-group"> |
177 | <h3> | 183 | <h3> |