aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-05-08 19:30:55 +0530
committerLibravatar GitHub <noreply@github.com>2021-05-08 16:00:55 +0200
commitd16807c4935e961b6a087bf20412299ef1a7b46c (patch)
tree24c9acb36fe2a43addc8affa6e84b74f66daa844 /src
parentdocs: add jakobsudau as a contributor (#1371) (diff)
downloadferdium-app-d16807c4935e961b6a087bf20412299ef1a7b46c.tar.gz
ferdium-app-d16807c4935e961b6a087bf20412299ef1a7b46c.tar.zst
ferdium-app-d16807c4935e961b6a087bf20412299ef1a7b46c.zip
Franz catchups to version 5.6.0 that are not related to macOS (#1372)
* Fix browser control icons in dark mode * Upgraded 'electron-builder' * Added missing system-dependencies for development of ferdi on linux * Fix crashes on navigation changes/reloads
Diffstat (limited to 'src')
-rw-r--r--src/features/webControls/components/WebControls.js1
-rw-r--r--src/index.js7
2 files changed, 4 insertions, 4 deletions
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index c6331073b..b9403bd0d 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -65,6 +65,7 @@ const styles = theme => ({
65 width: '20px !important', 65 width: '20px !important',
66 height: 20, 66 height: 20,
67 marginTop: 5, 67 marginTop: 5,
68 color: theme.colorText,
68 }, 69 },
69 input: { 70 input: {
70 marginBottom: 0, 71 marginBottom: 0,
diff --git a/src/index.js b/src/index.js
index b29cec831..2ca8d451b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -57,9 +57,7 @@ const debug = require('debug')('Ferdi:App');
57// From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the 57// From Electron 9 onwards, app.allowRendererProcessReuse = true by default. This causes the app to crash on Windows due to the
58// Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug 58// Electron Windows Notification API crashing. Setting this to false fixes the issue until the electron team fixes the notification bug
59// More Info - https://github.com/electron/electron/issues/18397 59// More Info - https://github.com/electron/electron/issues/18397
60if (isWindows) { 60app.allowRendererProcessReuse = false;
61 app.allowRendererProcessReuse = false;
62}
63 61
64// Globally set useragent to fix user agent override in service workers 62// Globally set useragent to fix user agent override in service workers
65debug('Set userAgent to ', userAgent()); 63debug('Set userAgent to ', userAgent());
@@ -378,7 +376,8 @@ if (argv['auth-negotiate-delegate-whitelist']) {
378} 376}
379 377
380// Disable Chromium's poor MPRIS implementation 378// Disable Chromium's poor MPRIS implementation
381app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService'); 379// and apply workaround for https://github.com/electron/electron/pull/26432
380app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService,CrossOriginOpenerPolicy');
382 381
383// This method will be called when Electron has finished 382// This method will be called when Electron has finished
384// initialization and is ready to create browser windows. 383// initialization and is ready to create browser windows.