scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-19 14:10:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove View#viewBounds in favour of #viewSize, and have View always occupy the full canvas.

Browse source
This commit is contained in:
Jürg Lehni 2011-06-22 07:56:16 +01:00
parent 1d9bad5d01
commit c2244be53b
1 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/ui/View.js
View file

@ -87,8 +87,8 @@ var View = this.View = Base.extend({
size = new Size(1024, 768);
this._canvas = CanvasProvider.getCanvas(size);
}
this._viewBounds = LinkedRectangle.create(this, 'setViewBounds',
0, 0, size.width, size.height);
this._viewSize = LinkedSize.create(this, 'setViewSize',
size.width, size.height);
this._context = this._canvas.getContext('2d');
this._matrix = new Matrix();
this._zoom = 1;
@ -107,23 +107,19 @@ var View = this.View = Base.extend({
},
/**
* The bounds of the view, i.e. the bounds of the part of the project which
* is visible in the window.
* The size of the view canvas. Changing the view's size will resize it's
* canvas.
*
* @type Rectangle
* @type Size
* @bean
*/
getViewBounds: function() {
return this._viewBounds;
getViewSize: function() {
return this._viewSize;
},
setViewBounds: function(bounds) {
bounds = Rectangle.read(arguments);
var size = bounds.getSize(),
delta = size.subtract(this._viewBounds.getSize());
// TODO: Take into acount bounds.x/y and decide on what grounds to
// change canvas size. Also, if x/y is not 0, do we need to add that
// to transform, or is that up to the user?
setViewSize: function(size) {
size = Size.read(arguments);
var delta = size.subtract(this._viewSize);
this._canvas.width = size.width;
this._canvas.height = size.height;
// Call onResize handler on any size change
@ -133,29 +129,20 @@ var View = this.View = Base.extend({
delta: delta
});
}
// Update _viewSize but don't notify of change.
this._viewSize.set(size.width, size.height, true);
// Force recalculation
this._bounds = null;
},
/**
* @type Size
* @bean
*/
getViewSize: function() {
return this._viewBounds.getSize();
},
setViewSize: function(size) {
this._viewBounds.setSize.apply(this._viewBounds, arguments);
},
/**
* @type Rectangle
* @bean
*/
getBounds: function() {
if (!this._bounds)
this._bounds = this._matrix._transformBounds(this._viewBounds);
this._bounds = this._matrix._transformBounds(
new Rectangle(new Point(), this._viewSize));
return this._bounds;
},
@ -227,10 +214,8 @@ var View = this.View = Base.extend({
// is always faster than setting canvas.width = canvas.width
// http://jsperf.com/clearrect-vs-setting-width/7
var ctx = this._context,
bounds = this._viewBounds;
ctx.clearRect(bounds._x, bounds._y,
// TODO: +1... what if we have multiple views in one canvas?
bounds._width + 1, bounds._height + 1);
size = this._viewSize;
ctx.clearRect(0, 0, size._width + 1, size._height + 1);
ctx.save();
this._matrix.applyToContext(ctx);