add screen stuff

willswire · Mar 1, 2019 · 3ff9837 · 3ff9837
1 parent 879f059
commit 3ff9837
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/electron/app/main.js b/electron/app/main.js
@@ -1,8 +1,8 @@
 // Declare constants required for ElectronJS to run properly
 const electron = require('electron');
 const {
-  app,
-  BrowserWindow,
+	app,
+	BrowserWindow,
 } = electron;
 
 let mainWindow;
@@ -14,36 +14,41 @@ var currentTime = 0;
 var currentTimeout = 0;
 
 // Slide changing Function
-var slideChanger = function() {
-  mainWindow.loadURL(SLIDE_URLS[currentSlide % SLIDE_URLS.length]);
-  currentTimeout = parseInt(TIMEOUT[currentTime % TIMEOUT.length]) * 1000;
-  currentSlide++;
-  currentTime++;
-  setTimeout(slideChanger, currentTimeout);
+var slideChanger = function () {
+	mainWindow.loadURL(SLIDE_URLS[currentSlide % SLIDE_URLS.length]);
+	currentTimeout = parseInt(TIMEOUT[currentTime % TIMEOUT.length]) * 1000;
+	currentSlide++;
+	currentTime++;
+	setTimeout(slideChanger, currentTimeout);
 }
 
 // Main Function
 app.on('ready', () => {
 
-  mainWindow = new BrowserWindow({
-    width: 1920,
-    height: 1080,
-    frame: false,
-    kiosk: true,
-    webPreferences: {
-      sandbox: false,
-      overlayScrollbars: false,
-      nodeIntegration: false,
-      allowRunningInsecureContent: true,
-      plugins: true,
-      nativeWindowOpen: true
-    }
-  });
-
-  process.on('uncaughtException', (err) => {
-    console.log(err);
-  });
-
-  setTimeout(slideChanger, currentTimeout);
+	var screenElectron = electron.screen;
+	var mainScreen = screenElectron.getPrimaryDisplay();
+	var dimensions = mainScreen.size;
+	console.log("The screen dimensions are: " + dimensions.width + "x" + dimensions.height);
+
+	mainWindow = new BrowserWindow({
+		width: dimensions.width,
+		height: dimensions.height,
+		frame: false,
+		kiosk: true,
+		webPreferences: {
+			sandbox: false,
+			overlayScrollbars: false,
+			nodeIntegration: false,
+			allowRunningInsecureContent: true,
+			plugins: true,
+			nativeWindowOpen: true
+		}
+	});
+
+	process.on('uncaughtException', (err) => {
+		console.log(err);
+	});
+
+	setTimeout(slideChanger, currentTimeout);
 
 });
diff --git a/vnc/Dockerfile.template b/vnc/Dockerfile.template
diff --git a/vnc/start.sh b/vnc/start.sh