resolving conflict

anirbandey303 · anirbandey303 · commit 0cb9bbbcfce6 · 2019-12-03T00:59:27.000+05:30
diff --git a/index.html b/index.html
@@ -10,6 +10,10 @@
             padding: 0;
             margin: 0;
         }
+        
+        canvas {
+            position: absolute;
+        }
     </style>
     <script src="p5.js"></script>
     <script src="p5.sound.js"></script>
diff --git a/main.js b/main.js
@@ -1,6 +1,9 @@
+let appWidth,appHeight; //variable to maintain the size of the app
 function setup()
 {
-	createCanvas(windowWidth,windowHeight);
+	appWidth=(windowWidth<1280)?1280:windowWidth; //minimum width of the app should be 1280 pixels and max should be the windowWidth
+	appHeight=(windowHeight<720)?720:windowHeight; //minimum height of the app should be 720 pixels and max should be the windowHeight
+	createCanvas(appWidth,appHeight);
 }
 
 function draw()
@@ -13,5 +16,7 @@ function draw()
 }
 function windowResized()
 {
-	resizeCanvas(windowWidth, windowHeight);
+	appWidth=(windowWidth<1280)?1280:windowWidth;
+	appHeight=(windowHeight<720)?720:windowHeight;
+	resizeCanvas(appWidth, appHeight);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
	`1`	`+let appWidth,appHeight; //variable to maintain the size of the app`
`1`	`2`	`function setup()`
`2`	`3`	`{`
`3`		`- createCanvas(windowWidth,windowHeight);`
	`4`	`+ appWidth=(windowWidth<1280)?1280:windowWidth; //minimum width of the app should be 1280 pixels and max should be the windowWidth`
	`5`	`+ appHeight=(windowHeight<720)?720:windowHeight; //minimum height of the app should be 720 pixels and max should be the windowHeight`
	`6`	`+ createCanvas(appWidth,appHeight);`
`4`	`7`	`}`
`5`	`8`
`6`	`9`	`function draw()`
`@@ -13,5 +16,7 @@ function draw()`
`13`	`16`	`}`
`14`	`17`	`function windowResized()`
`15`	`18`	`{`
`16`		`- resizeCanvas(windowWidth, windowHeight);`
	`19`	`+ appWidth=(windowWidth<1280)?1280:windowWidth;`
	`20`	`+ appHeight=(windowHeight<720)?720:windowHeight;`
	`21`	`+ resizeCanvas(appWidth, appHeight);`
`17`	`22`	`}`