Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: exposing Frame properties and removing redundant calls to __convert_disposal_mode__ #27

Merged
merged 2 commits into from
Sep 29, 2023
Merged

fix: exposing Frame properties and removing redundant calls to __convert_disposal_mode__ #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b39e771
fix: removing redundant calls to __convert_disposal_mode__ and exposi…
LeonChuu Feb 26, 2023
11d5e61
Merge branch 'master' into master
matmen Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ImageScript.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,16 @@ export class Frame extends Image {

constructor(width: number, height: number, duration?: number, xOffset?: number, yOffset?: number, disposalMode?: typeof Frame.DISPOSAL_KEEP | string);

duration: number;

xOffset: number;

yOffset: number;

get disposalMode(): number;

set disposalMode(disposalMode: string|number);

toString(): string;

static from(image: Image, duration?: number, xOffset?: number, yOffset?: number, disposalMode?: typeof Frame.DISPOSAL_KEEP | string): Frame;
Expand Down
20 changes: 16 additions & 4 deletions ImageScript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,15 +1269,29 @@ class Frame extends Image {
if (isNaN(duration) || duration < 0)
throw new RangeError('Invalid frame duration');

disposalMode = Frame.__convert_disposal_mode__(disposalMode);

super(width, height);
this.duration = duration;
this.xOffset = xOffset;
this.yOffset = yOffset;
this.disposalMode = disposalMode;
}

/**
* The Frame's disposal mode
* @returns {number}
*/
get disposalMode() {
return this.__disposalMode__;
}

/**
* Sets the frame's disposal mode, converting it to the internal numeric value.
* @param {string|number} disposalMode The frame's disposal mode
*/
set disposalMode(disposalMode) {
this.__disposalMode__ = Frame.__convert_disposal_mode__(disposalMode);
}

toString() {
return `Frame<${this.width}x${this.height}x${this.duration}ms>`;
}
Expand All @@ -1295,8 +1309,6 @@ class Frame extends Image {
if (!(image instanceof Image))
throw new TypeError('Invalid image passed');

disposalMode = Frame.__convert_disposal_mode__(disposalMode);

const frame = new Frame(image.width, image.height, duration, xOffset, yOffset, disposalMode);
frame.bitmap.set(image.bitmap);

Expand Down