diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-09 10:21:03 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-09 10:21:03 +0200 |
commit | 4a468ce53865e4f2dcc6b2c395fc158cde1f17dc (patch) | |
tree | 8e27953513fff38000ac2c3ca9be4229e52fb2f5 /src/components | |
parent | Fix merge errors (diff) | |
download | ferdium-app-4a468ce53865e4f2dcc6b2c395fc158cde1f17dc.tar.gz ferdium-app-4a468ce53865e4f2dcc6b2c395fc158cde1f17dc.tar.zst ferdium-app-4a468ce53865e4f2dcc6b2c395fc158cde1f17dc.zip |
Add option to always show service navigation bar
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/services/content/ServiceView.js | 7 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index e5f095952..041e9941d 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -125,8 +125,13 @@ export default @observer @inject('stores') class ServiceView extends Component { | |||
125 | reload, | 125 | reload, |
126 | edit, | 126 | edit, |
127 | enable, | 127 | enable, |
128 | stores, | ||
128 | } = this.props; | 129 | } = this.props; |
129 | 130 | ||
131 | const { | ||
132 | showServiceNavigationBar, | ||
133 | } = stores.settings.app; | ||
134 | |||
130 | const webviewClasses = classnames({ | 135 | const webviewClasses = classnames({ |
131 | services__webview: true, | 136 | services__webview: true, |
132 | 'services__webview-wrapper': true, | 137 | 'services__webview-wrapper': true, |
@@ -182,7 +187,7 @@ export default @observer @inject('stores') class ServiceView extends Component { | |||
182 | <> | 187 | <> |
183 | {!this.state.hibernate ? ( | 188 | {!this.state.hibernate ? ( |
184 | <> | 189 | <> |
185 | {service.recipe.id === CUSTOM_WEBSITE_ID && ( | 190 | {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && ( |
186 | <WebControlsScreen service={service} /> | 191 | <WebControlsScreen service={service} /> |
187 | )} | 192 | )} |
188 | <ServiceWebview | 193 | <ServiceWebview |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 1030f3164..b01368f69 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -225,6 +225,7 @@ export default @observer class EditSettingsForm extends Component { | |||
225 | <Toggle field={form.$('runInBackground')} /> | 225 | <Toggle field={form.$('runInBackground')} /> |
226 | <Toggle field={form.$('enableSystemTray')} /> | 226 | <Toggle field={form.$('enableSystemTray')} /> |
227 | <Toggle field={form.$('privateNotifications')} /> | 227 | <Toggle field={form.$('privateNotifications')} /> |
228 | <Toggle field={form.$('showServiceNavigationBar')} /> | ||
228 | <Toggle field={form.$('hibernate')} /> | 229 | <Toggle field={form.$('hibernate')} /> |
229 | {hibernationEnabled && ( | 230 | {hibernationEnabled && ( |
230 | <Select field={form.$('hibernationStrategy')} /> | 231 | <Select field={form.$('hibernationStrategy')} /> |