Enlarged Camera window

Author: gizmocuz

www/js/domoticz.js

@@ -1672,43 +1672,33 @@ function ShowCameraLiveStream(Name, camIdx) {
 	$('#dialog-camera-live #camfeed').attr("src", "images/camera_default.png");
 	//$('#dialog-camera-live #camfeed').attr("src", FeedURL);
 
-	var dwidth = $(window).width() / 2;
-	var dheight = $(window).height() / 2;
-
-	if (dwidth > 630) {
-		dwidth = 630;
-		dheight = parseInt((dwidth / 16) * 9);
-	}
-	if (dheight > 470) {
-		dheight = 470;
-		dwidth = parseInt((dheight / 9) * 16);
-	}
-	if (dwidth > dheight) {
-		dwidth = parseInt((dheight / 9) * 16);
-	}
-	else {
-		dheight = parseInt((dwidth / 16) * 9);
-	}
+	var windowWidth = $(window).width() - 20;
+	var windowHeight = $(window).height() - 150;
+	
+	var AspectSource = 4 / 3;
+
+	var height = windowHeight;
+	var width = Math.round(height * AspectSource) & ~1;
+	if (width > windowWidth) {
+		width = windowWidth;
+		height = Math.round(width / AspectSource) & ~1;
+	}
+	
 	//Set inner Camera feed width/height
-	$("#dialog-camera-live #camfeed").width(dwidth - 30);
-	$("#dialog-camera-live #camfeed").height(dheight - 16);
+	$("#dialog-camera-live #camfeed").width(width - 30);
+	$("#dialog-camera-live #camfeed").height(height - 16);
 
 	$("#dialog-camera-live").dialog({
 		resizable: false,
-		width: dwidth + 2,
-		height: dheight + 118,
+		width: width + 2,
+		height: height + 50,
 		position: {
 			my: "center",
 			at: "center",
 			of: window
 		},
 		modal: true,
 		title: unescape(Name),
-		buttons: {
-			"OK": function () {
-				$(this).dialog("close");
-			}
-		},
 		open: function () {
 			load_cam_video();
 		},