From 8aab8699e02ed9ec736bb6dfab0edd3fe9156c8d Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Tue, 27 Mar 2018 21:25:56 +0200
Subject: Split settings into multiple stores; app specific settings are now
 stored in config file

---
 src/containers/layout/AppLayoutContainer.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/containers/layout')

diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 075bd5e34..0931738fd 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -77,7 +77,7 @@ export default class AppLayoutContainer extends Component {
       <Sidebar
         services={services.allDisplayed}
         setActive={setActive}
-        isAppMuted={settings.all.isAppMuted}
+        isAppMuted={settings.all.app.isAppMuted}
         openSettings={openSettings}
         closeSettings={closeSettings}
         reorder={reorder}
@@ -87,7 +87,7 @@ export default class AppLayoutContainer extends Component {
         deleteService={deleteService}
         updateService={updateService}
         toggleMuteApp={toggleMuteApp}
-        showMessageBadgeWhenMutedSetting={settings.all.showMessageBadgeWhenMuted}
+        showMessageBadgeWhenMutedSetting={settings.all.app.showMessageBadgeWhenMuted}
         showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted}
       />
     );
@@ -99,7 +99,7 @@ export default class AppLayoutContainer extends Component {
         setWebviewReference={setWebviewReference}
         openWindow={openWindow}
         reload={reload}
-        isAppMuted={settings.all.isAppMuted}
+        isAppMuted={settings.all.app.isAppMuted}
         update={updateService}
       />
     );
-- 
cgit v1.2.3-70-g09d2


From 655a6ed192bb1942b641f073b8f0db10c8692374 Mon Sep 17 00:00:00 2001
From: Stefan <stefan@adlk.io>
Date: Wed, 28 Mar 2018 14:55:51 +0200
Subject: fix(Windows): Hide title bar when in fullscreen

---
 src/components/layout/AppLayout.js          |  4 +++-
 src/containers/layout/AppLayoutContainer.js |  1 +
 src/stores/AppStore.js                      | 10 ++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/containers/layout')

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 075bd5e34..222ffdc1a 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/stores/AppStore.js b/src/stores/AppStore.js
index 4ac8325d4..b3554f9d8 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -17,6 +17,8 @@ import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '..
 
 const { app } = remote;
 
+const mainWindow = remote.getCurrentWindow();
+
 const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
   name: 'Franz',
@@ -48,6 +50,8 @@ export default class AppStore extends Store {
 
   @observable isClearingAllCache = false;
 
+  @observable isFullScreen = mainWindow.isFullScreen();
+
   constructor(...args) {
     super(...args);
 
@@ -80,6 +84,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
@@ -170,8 +178,6 @@ export default class AppStore extends Store {
 
         this.actions.service.setActive({ serviceId });
 
-        const mainWindow = remote.getCurrentWindow();
-
         if (isWindows) {
           mainWindow.restore();
         } else if (isLinux) {
-- 
cgit v1.2.3-70-g09d2