5 files changed, 19 insertions, 14 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 66aef1730..746775a7f 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -43,6 +43,7 @@ const messages = defineMessages({
 @observer
 export default class AppLayout extends Component {
   static propTypes = {
+    isFullScreen: PropTypes.bool.isRequired,
     sidebar: PropTypes.element.isRequired,
     services: PropTypes.element.isRequired,
     children: PropTypes.element,
@@ -69,6 +70,7 @@ export default class AppLayout extends Component {
 
   render() {
     const {
+      isFullScreen,
       sidebar,
       services,
       children,
@@ -90,7 +92,7 @@ export default class AppLayout extends Component {
     return (
       <div>
         <div className="app">
-          {isWindows && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
           <div className="app__content">
             {sidebar}
             <div className="app__service">
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 0931738fd..9212f809f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -106,6 +106,7 @@ export default class AppLayoutContainer extends Component {
 
     return (
       <AppLayout
+        isFullScreen={app.isFullScreen}
         isOnline={app.isOnline}
         showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
         appUpdateIsDownloaded={app.updateStatus === app.updateStatusTypes.DOWNLOADED}
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 5a05e47b3..19b8d5b15 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -415,7 +415,7 @@ const _titleBarTemplateFactory = intl => [
         label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
           ? intl.formatMessage(menuItems.exitFullScreen)
           : intl.formatMessage(menuItems.enterFullScreen),
-        accelerator: `${ctrlKey}+F`,
+        accelerator: 'F11',
         click(menuItem, browserWindow) {
           browserWindow.setFullScreen(!browserWindow.isFullScreen());
         },
@@ -431,14 +431,14 @@ const _titleBarTemplateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.minimize),
-        accelerator: 'Alt+M',
+        accelerator: 'Ctrl+M',
         click(menuItem, browserWindow) {
           browserWindow.minimize();
         },
       },
       {
         label: intl.formatMessage(menuItems.close),
-        accelerator: 'Alt+W',
+        accelerator: 'Ctrl+W',
         click(menuItem, browserWindow) {
           browserWindow.close();
         },
@@ -450,7 +450,7 @@ const _titleBarTemplateFactory = intl => [
     submenu: [
       {
         label: intl.formatMessage(menuItems.learnMore),
-        click() { shell.openExternal('http://meetfranz.com'); },
+        click() { shell.openExternal('https://meetfranz.com'); },
       },
       {
         label: intl.formatMessage(menuItems.changelog),
@@ -461,7 +461,7 @@ const _titleBarTemplateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.support),
-        click() { shell.openExternal('http://meetfranz.com/support'); },
+        click() { shell.openExternal('https://meetfranz.com/support'); },
       },
       {
         type: 'separator',
@@ -643,10 +643,7 @@ export default class FranzMenu {
         },
         {
           label: intl.formatMessage(menuItems.quit),
-          accelerator: 'Alt+F4',
-          click: () => {
-            app.quit();
-          },
+          role: 'quit',
         },
       ];
 
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index ea1e71bdc..38edff1b4 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -19,6 +19,8 @@ const debug = require('debug')('AppStore');
 
 const { app } = remote;
 
+const mainWindow = remote.getCurrentWindow();
+
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
   name: 'Franz',
@@ -50,6 +52,8 @@ export default class AppStore extends Store {
 
   @observable isClearingAllCache = false;
 
+  @observable isFullScreen = mainWindow.isFullScreen();
+
   constructor(...args) {
     super(...args);
 
@@ -82,6 +86,10 @@ export default class AppStore extends Store {
     window.addEventListener('online', () => { this.isOnline = true; });
     window.addEventListener('offline', () => { this.isOnline = false; });
 
+    mainWindow.on('enter-full-screen', () => { this.isFullScreen = true; });
+    mainWindow.on('leave-full-screen', () => { this.isFullScreen = false; });
+
+
     this.isOnline = navigator.onLine;
 
     // Check if Franz should launch on start
@@ -172,8 +180,6 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        const mainWindow = remote.getCurrentWindow();
-
         if (isWindows) {
           mainWindow.restore();
         } else if (isLinux) {
diff --git a/src/styles/title-bar.scss b/src/styles/title-bar.scss
index 492245e2f..5316f35b3 100644
--- a/src/styles/title-bar.scss
+++ b/src/styles/title-bar.scss
@@ -32,8 +32,7 @@
       margin: 4px;
       border-radius: $theme-border-radius-small;
     }
-    &.selected {
-      // background: $theme-brand-primary;
+    &.selected, &.selected:focus {
       background: none;
 
       .menu-item {