Skip to content

Commit

Permalink
[anim-pane] Fix 'until' effects resizing (from 'right' edge)
Browse files Browse the repository at this point in the history
  • Loading branch information
@belozertsev
belozertsev committed Feb 6, 2024
1 parent 61c83f7 commit 9f26919
Showing 1 changed file with 48 additions and 18 deletions.
66 changes: 48 additions & 18 deletions slide/Drawing/anim-pane.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1812,6 +1812,7 @@
// Temp fields for effect bar movement
this.tmpDelay = null;
this.tmpDuration = null;
this.tmpRepeatCount = null;

// Callback functions for effect bar events
this.onMouseDownCallback = function (event, x, y) {
Expand All @@ -1825,6 +1826,11 @@
this.tmpDelay = this.getDelay();
this.tmpDuration = this.getDuration();

if (this.effect.isUntilEffect() && hitRes.type === 'right') {
this.tmpRepeatCount = this.getRepeatCount();
this.initialTmpRepeatCount = this.tmpRepeatCount;
}

this.onUpdate();
}
}
Expand All @@ -1841,9 +1847,8 @@
}
this.onMouseUpCallback = function (event, x, y) {
if (!this.hitResult) { return }

this.setNewEffectParams(this.tmpDelay, this.tmpDuration);
this.hitResult = this.tmpDelay = this.tmpDuration = null;
this.setNewEffectParams(this.tmpDelay, this.tmpDuration, this.tmpRepeatCount);
this.hitResult = this.tmpDelay = this.tmpDuration = this.tmpRepeatCount = null;

this.onUpdate()
}
Expand Down Expand Up @@ -1909,7 +1914,7 @@
CAnimItem.prototype.handleMovement = function (x, y) {
const timeline = Asc.editor.WordControl.m_oAnimPaneApi.timeline.Control.timeline;
const timelineShift = this.ms_to_mm(timeline.getStartTime() * 1000);
const repeats = this.effect.asc_getRepeatCount() / 1000;
const repeats = this.getRepeatCount() / 1000;

let pointOfLanding = x - this.getLeftBorder() + timelineShift;
if (this.effect.isAfterEffect()) {
Expand All @@ -1921,11 +1926,19 @@
}

if (this.hitResult.type === 'right') {
const pointOfContact = this.ms_to_mm(this.effect.asc_getDelay() + this.effect.asc_getDuration() * repeats);
let diff = this.mm_to_ms(pointOfLanding - pointOfContact);
if (this.effect.isUntilEffect()) {
const pointOfContact = this.ms_to_mm(this.effect.asc_getDelay() + this.effect.asc_getDuration() * this.initialTmpRepeatCount / 1000);
let diff = this.mm_to_ms(pointOfLanding - pointOfContact);

const newTmpDuration = this.effect.asc_getDuration() + diff / repeats;
this.tmpDuration = Math.max(MIN_ALLOWED_DURATION, newTmpDuration);
const newTmpRepeatCount = this.initialTmpRepeatCount + diff / (this.effect.asc_getDuration() / 1000);
this.tmpRepeatCount = Math.max(newTmpRepeatCount, MIN_ALLOWED_REPEAT_COUNT);
} else {
const pointOfContact = this.ms_to_mm(this.effect.asc_getDelay() + this.effect.asc_getDuration() * repeats);
let diff = this.mm_to_ms(pointOfLanding - pointOfContact);

const newTmpDuration = this.effect.asc_getDuration() + diff / repeats;
this.tmpDuration = Math.max(MIN_ALLOWED_DURATION, newTmpDuration);
}
}

if (this.hitResult.type === 'left') {
Expand Down Expand Up @@ -1986,6 +1999,16 @@
CAnimItem.prototype.getDuration = function () {
return this.tmpDuration !== null ? this.tmpDuration : this.effect.asc_getDuration()
}
CAnimItem.prototype.getRepeatCount = function () {
if (this.tmpRepeatCount !== null) { return this.tmpRepeatCount; }
else if (this.effect.asc_getRepeatCount() > 0) { return this.effect.asc_getRepeatCount(); }
else {
const bounds = this.getEffectBarBounds();
const width = bounds.r - bounds.l;
const totalWidth = this.getRightBorder() - bounds.l;
return (totalWidth / width * 1000) >> 0; // approximate repeat counter
}
}

CAnimItem.prototype.getLeftBorder = function () {
const timeline = Asc.editor.WordControl.m_oAnimPaneApi.timeline.Control.timeline;
Expand Down Expand Up @@ -2091,11 +2114,12 @@
graphics.ds();
} else {
let repeats;
if (this.effect.isUntilEffect()) {
if (this.effect.isUntilEffect() && this.tmpRepeatCount === null) {
// In case we need to draw an infinite bar with an arrow

const barWidth = Math.max(this.getRightBorder() - bounds.l - EFFECT_BAR_HEIGHT, this.ms_to_mm(MIN_ALLOWED_DURATION));
repeats = barWidth / (bounds.r - bounds.l);
// repeats = barWidth / (bounds.r - bounds.l);
repeats = this.getRepeatCount() / 1000;

let transform = graphics.m_oFullTransform;
let left = (transform.TransformPointX(bounds.l, bounds.t) + 0.5) >> 0;
Expand All @@ -2116,7 +2140,7 @@
} else {
// In case we need to draw a bar

repeats = this.effect.asc_getRepeatCount() / 1000;
repeats = this.getRepeatCount() / 1000;
const barWidth = (bounds.r - bounds.l) * repeats;
graphics.rect(bounds.l, bounds.t, barWidth, bounds.b - bounds.t);
}
Expand All @@ -2142,7 +2166,7 @@
if (isOutOfBorders) { return null; }

const width = bounds.r - bounds.l;
const repeats = this.effect.asc_getRepeatCount() / 1000;
const repeats = this.getRepeatCount() / 1000;
const delta = AscFormat.DIST_HIT_IN_LINE / 2

let barRight = this.effect.isUntilEffect() ? this.getRightBorder() : bounds.l + width * repeats;
Expand Down Expand Up @@ -2175,25 +2199,30 @@
};


CAnimItem.prototype.setNewEffectParams = function (newDelay, newDuration) {
CAnimItem.prototype.setNewEffectParams = function (newDelay, newDuration, newRepeatCount) {
const minAllowedDelta = 1 // in ms
const delayDiff = Math.abs(newDelay - this.effect.asc_getDelay())
const durationDiff = Math.abs(newDuration - this.effect.asc_getDuration())
if (delayDiff < minAllowedDelta && durationDiff < minAllowedDelta ) { return }
const delayDiff = Math.abs(newDelay - this.effect.asc_getDelay());
const durationDiff = Math.abs(newDuration - this.effect.asc_getDuration());
const repeatCountDiff = Math.abs(newRepeatCount - this.effect.asc_getRepeatCount());

const effectCopy = AscFormat.ExecuteNoHistory(function () {
let oCopy = this.effect.createDuplicate();
oCopy.merge(this.effect);
return oCopy;
}, this, []);

if (newDelay !== null && newDelay !== undefined) {
if (newDelay !== null && newDelay !== undefined && delayDiff >= minAllowedDelta) {
effectCopy.asc_putDelay(newDelay);
}
if (newDuration !== null && newDuration !== undefined) {
if (newDuration !== null && newDuration !== undefined && durationDiff >= minAllowedDelta) {
effectCopy.asc_putDuration(newDuration);
}
if (newRepeatCount !== null && newRepeatCount !== undefined && repeatCountDiff >= 1) {
effectCopy.asc_putRepeatCount(newRepeatCount);
}

if (this.effect.isEqualProperties(effectCopy)) { return }
console.log('changes')
Asc.editor.WordControl.m_oLogicDocument.SetAnimationProperties(effectCopy);
};

Expand Down Expand Up @@ -2305,6 +2334,7 @@

// List
const MIN_ALLOWED_DURATION = 10; // milliseconds
const MIN_ALLOWED_REPEAT_COUNT = 10; // equals 0.01 of full effect duration


window['AscCommon'] = window['AscCommon'] || {};
Expand Down

0 comments on commit 9f26919

Please sign in to comment.