diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-03-19 13:04:30 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-03-19 13:04:30 +0100 |
commit | 698e78484b70a76658d4931e5865ba9ac315b61f (patch) | |
tree | 955bb2599cf612101006206c5bb90a21559cdf4c | |
parent | Add .nvmrc to match electron node version (diff) | |
download | ferdium-app-698e78484b70a76658d4931e5865ba9ac315b61f.tar.gz ferdium-app-698e78484b70a76658d4931e5865ba9ac315b61f.tar.zst ferdium-app-698e78484b70a76658d4931e5865ba9ac315b61f.zip |
Disable custom titlebar for Linux
-rw-r--r-- | src/components/layout/AppLayout.js | 4 | ||||
-rw-r--r-- | src/index.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 686476317..4aff6ff72 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -7,7 +7,7 @@ import { TitleBar } from 'electron-react-titlebar'; | |||
7 | import InfoBar from '../ui/InfoBar'; | 7 | import InfoBar from '../ui/InfoBar'; |
8 | import globalMessages from '../../i18n/globalMessages'; | 8 | import globalMessages from '../../i18n/globalMessages'; |
9 | 9 | ||
10 | import { isMac } from '../../environment'; | 10 | import { isMac, isLinux } from '../../environment'; |
11 | 11 | ||
12 | function createMarkup(HTMLString) { | 12 | function createMarkup(HTMLString) { |
13 | return { __html: HTMLString }; | 13 | return { __html: HTMLString }; |
@@ -90,7 +90,7 @@ export default class AppLayout extends Component { | |||
90 | return ( | 90 | return ( |
91 | <div> | 91 | <div> |
92 | <div className="app"> | 92 | <div className="app"> |
93 | {!isMac && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} | 93 | {!isMac || !isLinux && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} |
94 | <div className="app__content"> | 94 | <div className="app__content"> |
95 | {sidebar} | 95 | {sidebar} |
96 | <div className="app__service"> | 96 | <div className="app__service"> |
diff --git a/src/index.js b/src/index.js index 96bcea4ac..cc0f1aa45 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'; |
@@ -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 ? true : false, |
77 | backgroundColor: '#3498db', | 77 | backgroundColor: '#3498db', |
78 | }); | 78 | }); |
79 | 79 | ||