Skip to content

Commit 99591f0

Browse files
committed
Added new Scale Manager config properties
1 parent fc9b6f7 commit 99591f0

1 file changed

Lines changed: 31 additions & 3 deletions

File tree

src/boot/Config.js

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,35 @@ var Config = new Class({
273273
this.parent = GetValue(config, 'parent', null);
274274

275275
/**
276-
* @const {?*} Phaser.Boot.Config#scaleMode - [description]
276+
* @const {integer} Phaser.Boot.Config#scaleMode - [description]
277277
*/
278278
this.scaleMode = GetValue(config, 'scaleMode', 0);
279279

280+
/**
281+
* @const {boolean} Phaser.Boot.Config#expandParent - [description]
282+
*/
283+
this.expandParent = GetValue(config, 'expandParent', false);
284+
285+
/**
286+
* @const {integer} Phaser.Boot.Config#minWidth - [description]
287+
*/
288+
this.minWidth = GetValue(config, 'minWidth', 0);
289+
290+
/**
291+
* @const {integer} Phaser.Boot.Config#maxWidth - [description]
292+
*/
293+
this.maxWidth = GetValue(config, 'maxWidth', 0);
294+
295+
/**
296+
* @const {integer} Phaser.Boot.Config#minHeight - [description]
297+
*/
298+
this.minHeight = GetValue(config, 'minHeight', 0);
299+
300+
/**
301+
* @const {integer} Phaser.Boot.Config#maxHeight - [description]
302+
*/
303+
this.maxHeight = GetValue(config, 'maxHeight', 0);
304+
280305
// Scale Manager - Anything set in here over-rides anything set above
281306

282307
var scaleConfig = GetValue(config, 'scale', null);
@@ -289,8 +314,11 @@ var Config = new Class({
289314
this.resolution = GetValue(scaleConfig, 'resolution', this.resolution);
290315
this.parent = GetValue(scaleConfig, 'parent', this.parent);
291316
this.scaleMode = GetValue(scaleConfig, 'mode', this.scaleMode);
292-
293-
// TODO: Add in min / max sizes
317+
this.expandParent = GetValue(scaleConfig, 'mode', this.expandParent);
318+
this.minWidth = GetValue(scaleConfig, 'min.width', this.minWidth);
319+
this.maxWidth = GetValue(scaleConfig, 'max.width', this.maxWidth);
320+
this.minHeight = GetValue(scaleConfig, 'min.height', this.minHeight);
321+
this.maxHeight = GetValue(scaleConfig, 'max.height', this.maxHeight);
294322
}
295323

296324
/**

0 commit comments

Comments
 (0)