Implemented Browser.setCanvasSize to have a central point for resizing <canvas>

4 files changed, 13 insertions, 12 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 5291dcee..27bf4a0c 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -347,6 +347,12 @@ mergeInto(LibraryManager.library, {
       });
       addRunDependency('al ' + url);
     },
+    
+    setCanvasSize: function(width, height) {
+      var canvas = Module['canvas'];
+      canvas.width = width;
+      canvas.height = height;
+    }
   },
 
   emscripten_async_wget: function(url, file, onload, onerror) {
@@ -494,8 +500,7 @@ mergeInto(LibraryManager.library, {
   },
 
   emscripten_set_canvas_size: function(width, height) {
-    Module['canvas'].width = width;
-    Module['canvas'].height = height;
+    Browser.setCanvasSize(width, height);
   },
 
   emscripten_get_now: function() {
diff --git a/src/library_glut.js b/src/library_glut.js
index d33f8436..b146cf47 100644
--- a/src/library_glut.js
+++ b/src/library_glut.js
@@ -237,8 +237,7 @@ var LibraryGLUT = {
         document.removeEventListener('mozfullscreenchange', GLUT.onFullScreenEventChange, true);
         document.removeEventListener('webkitfullscreenchange', GLUT.onFullScreenEventChange, true);
       }
-      Module['canvas'].width  = width;
-      Module['canvas'].height = height;
+      Browser.setCanvasSize(width, height);
       /* Can't call _glutReshapeWindow as that requests cancelling fullscreen. */
       if (GLUT.reshapeFunc) {
         // console.log("GLUT.reshapeFunc (from FS): " + width + ", " + height);
@@ -274,8 +273,8 @@ var LibraryGLUT = {
   },
 
   glutInitWindowSize: function(width, height) {
-    Module['canvas'].width  = GLUT.initWindowWidth  = width;
-    Module['canvas'].height = GLUT.initWindowHeight = height;
+    Browser.setCanvasSize( GLUT.initWindowWidth = width,
+                           GLUT.initWindowHeight = height );
   },
 
   glutInitWindowPosition: function(x, y) {
@@ -371,8 +370,7 @@ var LibraryGLUT = {
   glutReshapeWindow: function(width, height) {
     GLUT.cancelFullScreen();
     // console.log("glutReshapeWindow: " + width + ", " + height);
-    Module['canvas'].width  = width;
-    Module['canvas'].height = height;
+    Browser.setCanvasSize(width, height);
     if (GLUT.reshapeFunc) {
       // console.log("GLUT.reshapeFunc: " + width + ", " + height);
       FUNCTION_TABLE[GLUT.reshapeFunc](width, height);
diff --git a/src/library_sdl.js b/src/library_sdl.js
index da1e88af..c056c3f1 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -659,8 +659,7 @@ var LibrarySDL = {
     ['mousedown', 'mouseup', 'mousemove', 'DOMMouseScroll', 'mousewheel', 'mouseout'].forEach(function(event) {
       Module['canvas'].addEventListener(event, SDL.receiveEvent, true);
     });
-    Module['canvas'].width = width;
-    Module['canvas'].height = height;
+    Browser.setCanvasSize(width, height);
     return SDL.screen = SDL.makeSurface(width, height, flags, true, 'screen');
   },
 
diff --git a/src/library_xlib.js b/src/library_xlib.js
index a110c786..7e420400 100644
--- a/src/library_xlib.js
+++ b/src/library_xlib.js
@@ -6,8 +6,7 @@ var LibraryXlib = {
 
   XCreateWindow: function(display, parent, x, y, width, height, border_width, depth, class_, visual, valuemask, attributes) {
     // All we can do is set the width and height
-    Module['canvas'].width = width;
-    Module['canvas'].height = height;
+    Browser.setCanvasSize(width, height);
     return 2;
   },