Shows presenter-view without external display (#248)

* Shows presenter-view without external display * fixes presenter-view switching while casting
KhalisFoundation · Aug 15, 2018 · 119b4b4 · 119b4b4
1 parent fbe9e4f
commit 119b4b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/app.js b/app.js
@@ -211,6 +211,7 @@ function createViewer(ipcData) {
       });
     });
   }
+  mainWindow.webContents.send('presenter-view');
 }
 
 app.on('ready', () => {

diff --git a/www/js/controller.js b/www/js/controller.js
@@ -378,12 +378,20 @@ function updateViewerScale() {
   }
 }
 
-global.platform.ipc.on('external-display', (e, args) => {
+function checkPresenterView() {
   if (store.getUserPref('app.layout.presenter-view')) {
     document.body.classList.add('presenter-view');
     document.body.classList.remove('home');
+    document.body.classList.add('scale-viewer');
   }
-  document.body.classList.add('scale-viewer');
+}
+
+global.platform.ipc.on('presenter-view', () => {
+  checkPresenterView();
+  updateViewerScale();
+});
+
+global.platform.ipc.on('external-display', (e, args) => {
   global.externalDisplay = {
     width: args.width,
     height: args.height,
@@ -427,11 +435,9 @@ global.platform.ipc.on('cast-session-active', () => {
   menuCast.items[0].visible = false;
   menuCast.items[1].visible = true;
 
-  if (store.getUserPref('app.layout.presenter-view')) {
-    document.body.classList.add('presenter-view', 'scale-viewer');
-    document.body.classList.remove('home');
-    updateViewerScale();
-  }
+  store.setUserPref('app.layout.presenter-view', true);
+  checkPresenterView();
+  updateViewerScale();
 
   store.set('userPrefs.slide-layout.display-options.akhandpaatt', false);
   store.set('userPrefs.slide-layout.display-options.disable-akhandpaatt', true);
@@ -441,8 +447,10 @@ global.platform.ipc.on('cast-session-active', () => {
 global.platform.ipc.on('cast-session-stopped', () => {
   menuCast.items[1].visible = false;
   menuCast.items[0].visible = true;
-  if (!global.externalDisplay) {
+  if (store.getUserPref('app.layout.presenter-view')) {
     document.body.classList.remove('presenter-view', 'scale-viewer');
+    store.setUserPref('app.layout.presenter-view', false);
+    global.core.platformMethod('updateSettings');
   }
   store.set('userPrefs.slide-layout.display-options.disable-akhandpaatt', false);
 });
@@ -473,6 +481,7 @@ module.exports = {
   },
 
   'presenter-view': function presenterView() {
+    checkPresenterView();
     updateViewerScale();
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -211,6 +211,7 @@ function createViewer(ipcData) { @@
           });
         });
       }
+      mainWindow.webContents.send('presenter-view');
     }
     app.on('ready', () => {
@@ Expand Down @@