diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-03-19 15:15:02 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-03-19 15:15:02 +0100 |
commit | 5cedd96e15edf3caf0c3204c2f4f919f07ba7df9 (patch) | |
tree | 3023464dcef92393d30953f92ec92a1dc70a7062 /src/index.js | |
parent | Merge branch 'i18n' into release/5.0.0-beta.17 (diff) | |
parent | fix(Linux): Fix missing ubuntu tray icon (diff) | |
download | ferdium-app-5cedd96e15edf3caf0c3204c2f4f919f07ba7df9.tar.gz ferdium-app-5cedd96e15edf3caf0c3204c2f4f919f07ba7df9.tar.zst ferdium-app-5cedd96e15edf3caf0c3204c2f4f919f07ba7df9.zip |
Merge branch 'develop' into release/5.0.0-beta.17
Diffstat (limited to 'src/index.js')
-rw-r--r-- | src/index.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/index.js b/src/index.js index 96bcea4ac..9c1f94f18 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -4,7 +4,7 @@ import path from 'path'; | |||
4 | 4 | ||
5 | import windowStateKeeper from 'electron-window-state'; | 5 | import windowStateKeeper from 'electron-window-state'; |
6 | 6 | ||
7 | import { isDevMode, isMac, isWindows } from './environment'; | 7 | import { isDevMode, isMac, isWindows, isLinux } from './environment'; |
8 | import ipcApi from './electron/ipc-api'; | 8 | import ipcApi from './electron/ipc-api'; |
9 | import Tray from './lib/Tray'; | 9 | import Tray from './lib/Tray'; |
10 | import Settings from './electron/Settings'; | 10 | import Settings from './electron/Settings'; |
@@ -48,11 +48,11 @@ if (isSecondInstance) { | |||
48 | app.exit(); | 48 | app.exit(); |
49 | } | 49 | } |
50 | 50 | ||
51 | // Lets disable Hardware Acceleration until we have a better solution | 51 | // Fix Unity indicator issue |
52 | // to deal with the high-perf-gpu requirement of some services | 52 | // https://github.com/electron/electron/issues/9046 |
53 | 53 | if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) { | |
54 | // Disabled to test tweetdeck glitches | 54 | process.env.XDG_CURRENT_DESKTOP = 'Unity' |
55 | // app.disableHardwareAcceleration(); | 55 | } |
56 | 56 | ||
57 | // Initialize Settings | 57 | // Initialize Settings |
58 | const settings = new Settings(); | 58 | const settings = new Settings(); |
@@ -73,7 +73,7 @@ const createWindow = () => { | |||
73 | minWidth: 600, | 73 | minWidth: 600, |
74 | minHeight: 500, | 74 | minHeight: 500, |
75 | titleBarStyle: isMac ? 'hidden' : '', | 75 | titleBarStyle: isMac ? 'hidden' : '', |
76 | frame: false, | 76 | frame: isLinux, |
77 | backgroundColor: '#3498db', | 77 | backgroundColor: '#3498db', |
78 | }); | 78 | }); |
79 | 79 | ||