Merge branch 'develop' into release/5.0.0-beta.17

2 files changed, 9 insertions, 9 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 686476317..66aef1730 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -7,7 +7,7 @@ import { TitleBar } from 'electron-react-titlebar';
 import InfoBar from '../ui/InfoBar';
 import globalMessages from '../../i18n/globalMessages';
 
-import { isMac } from '../../environment';
+import { isWindows } from '../../environment';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
@@ -90,7 +90,7 @@ export default class AppLayout extends Component {
     return (
       <div>
         <div className="app">
-          {!isMac && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          {isWindows && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
           <div className="app__content">
             {sidebar}
             <div className="app__service">
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';
 
 import windowStateKeeper from 'electron-window-state';
 
-import { isDevMode, isMac, isWindows } from './environment';
+import { isDevMode, isMac, isWindows, isLinux } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -48,11 +48,11 @@ if (isSecondInstance) {
   app.exit();
 }
 
-// Lets disable Hardware Acceleration until we have a better solution
-// to deal with the high-perf-gpu requirement of some services
-
-// Disabled to test tweetdeck glitches
-// app.disableHardwareAcceleration();
+// Fix Unity indicator issue
+// https://github.com/electron/electron/issues/9046
+if (isLinux && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
+  process.env.XDG_CURRENT_DESKTOP = 'Unity'
+}
 
 // Initialize Settings
 const settings = new Settings();
@@ -73,7 +73,7 @@ const createWindow = () => {
     minWidth: 600,
     minHeight: 500,
     titleBarStyle: isMac ? 'hidden' : '',
-    frame: false,
+    frame: isLinux,
     backgroundColor: '#3498db',
   });