Merge branch 'master' into cleanup-this-references

This commit is contained in:
Nathan Shively-Sanders 2019-02-27 18:09:58 -08:00
commit 7beb2b65a4
2 changed files with 10 additions and 0 deletions

View File

@ -2302,6 +2302,15 @@ interface IObjectOptions {
* Describes the object's corner position in canvas object absolute properties.
*/
aCoords?: {bl: Point, br: Point, tl: Point, tr: Point};
/**
* Describe object's corner position in canvas element coordinates. properties are tl,mt,tr,ml,mr,bl,mb,br,mtr for
* the main controls. each property is an object with x, y and corner. The `corner` property contains in a similar
* manner the 4 points of the interactive area of the corner. The coordinates depends from this properties: width,
* height, scaleX, scaleY skewX, skewY, angle, strokeWidth, viewportTransform, top, left, padding. The coordinates
* get updated with @method setCoords. You can calculate them without updating with @method calcCoords;
*/
oCoords?: { tl: Point, mt: Point, tr: Point, ml: Point, mr: Point, bl: Point, mb: Point, br: Point, mtr: Point }
}
export interface Object extends IObservable<Object>, IObjectOptions, IObjectAnimation<Object> { }
export class Object {

View File

@ -7,6 +7,7 @@
// Brian Martinson <https://github.com/bmartinson>
// Rogerio Teixeira <https://github.com/RogerioTeixeira>
// Bradley Hill <https://github.com/BradleyHill>
// Glenn Gartner <https://github.com/glenngartner>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.1
export import fabric = require("./fabric-impl");