pull/3/merge
jmoenig 2014-02-13 12:04:13 +01:00
rodzic 5058595335
commit 2411ca3ebd
2 zmienionych plików z 12 dodań i 2 usunięć

13
gui.js
Wyświetl plik

@ -1447,7 +1447,8 @@ IDE_Morph.prototype.setProjectName = function (string) {
// IDE_Morph resizing
IDE_Morph.prototype.setExtent = function (point) {
var minExt,
var padding = new Point(430, 110),
minExt,
ext;
// determine the minimum dimensions making sense for the current mode
@ -1462,8 +1463,13 @@ IDE_Morph.prototype.setExtent = function (point) {
this.stageRatio = 0.5;
}
*/
minExt = this.isSmallStage ?
padding.add(StageMorph.prototype.dimensions.divideBy(2))
: padding.add(StageMorph.prototype.dimensions);
/*
minExt = this.isSmallStage ?
new Point(700, 350) : new Point(910, 490);
*/
}
ext = point.max(minExt);
IDE_Morph.uber.setExtent.call(this, ext);
@ -3529,6 +3535,7 @@ IDE_Morph.prototype.setStageHeight = function (num) {
IDE_Morph.prototype.setStageExtent = function (aPoint) {
var myself = this,
world = this.world(),
ext = aPoint.max(new Point(480, 180));
function zoom() {
@ -3546,13 +3553,14 @@ IDE_Morph.prototype.setStageExtent = function (aPoint) {
myself.stage.setExtent(StageMorph.prototype.dimensions);
myself.stage.clearPenTrails();
myself.fixLayout();
this.setExtent(world.extent());
};
}
this.stageRatio = 1;
this.isSmallStage = false;
this.controlBar.stageSizeButton.refresh();
this.setExtent(this.world().extent());
this.setExtent(world.extent());
if (this.isAnimating) {
zoom();
} else {
@ -3560,6 +3568,7 @@ IDE_Morph.prototype.setStageExtent = function (aPoint) {
this.stage.setExtent(StageMorph.prototype.dimensions);
this.stage.clearPenTrails();
this.fixLayout();
this.setExtent(world.extent());
}
};

Wyświetl plik

@ -2099,3 +2099,4 @@ ______
140213
------
* GUI, Store: constrain minimum stage size to 480 x 180
* GUI: Fixed #322, #324