Browse Source

fix: screen to val method

Ievgen Naida 5 years ago
parent
commit
642e398a4b
4 changed files with 6 additions and 7 deletions
  1. 3 4
      lib/animation-timeline.js
  2. 0 0
      lib/animation-timeline.min.js
  3. 0 0
      lib/timeline.js.map
  4. 3 3
      src/timeline.ts

+ 3 - 4
lib/animation-timeline.js

@@ -1915,7 +1915,7 @@ var timeline_Timeline = /*#__PURE__*/function (_TimelineEventsEmitte) {
         x = x + deltaSpeed;
         var diff = this._width() / x;
 
-        var val = this._fromScreen(x - this._leftMargin());
+        var val = this._fromScreen(x);
 
         var zoom = direction * this._currentZoom * speed; //this._options.zoom
 
@@ -2688,7 +2688,7 @@ var timeline_Timeline = /*#__PURE__*/function (_TimelineEventsEmitte) {
   }, {
     key: "_fromScreen",
     value: function _fromScreen(px) {
-      return this.pxToVal(this._leftMargin() + this.getScrollLeft() + px);
+      return this.pxToVal(this.getScrollLeft() + px - this._leftMargin());
     }
     /**
      * Convert area value to global screen pixel coordinates.
@@ -2738,8 +2738,7 @@ var timeline_Timeline = /*#__PURE__*/function (_TimelineEventsEmitte) {
     key: "_mousePosToVal",
     value: function _mousePosToVal(x) {
       var snapEnabled = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
-      var mousePos = Math.min(x, this._width()) - this._leftMargin();
+      var mousePos = Math.min(x, this._width());
 
       var convertedVal = this._fromScreen(mousePos);
 

File diff suppressed because it is too large
+ 0 - 0
lib/animation-timeline.min.js


File diff suppressed because it is too large
+ 0 - 0
lib/timeline.js.map


+ 3 - 3
src/timeline.ts

@@ -321,7 +321,7 @@ export class Timeline extends TimelineEventsEmitter {
       const deltaSpeed = TimelineUtils.getDistance(this._width() / 2, x) * 0.2;
       x = x + deltaSpeed;
       const diff = this._width() / x;
-      const val = this._fromScreen(x - this._leftMargin());
+      const val = this._fromScreen(x);
       const zoom = direction * this._currentZoom * speed;
       //this._options.zoom
       this._currentZoom = this._setZoom(this._currentZoom + zoom);
@@ -1163,7 +1163,7 @@ export class Timeline extends TimelineEventsEmitter {
    * Convert screen local coordinates to a global value info.
    */
   _fromScreen(px: number): number {
-    return this.pxToVal(this._leftMargin() + this.getScrollLeft() + px);
+    return this.pxToVal(this.getScrollLeft() + px - this._leftMargin());
   }
   /**
    * Convert area value to global screen pixel coordinates.
@@ -1200,7 +1200,7 @@ export class Timeline extends TimelineEventsEmitter {
   }
 
   _mousePosToVal(x: number, snapEnabled = false): number {
-    const mousePos = Math.min(x, this._width()) - this._leftMargin();
+    const mousePos = Math.min(x, this._width());
     let convertedVal = this._fromScreen(mousePos);
     convertedVal = Math.round(convertedVal);
     if (snapEnabled) {

Some files were not shown because too many files changed in this diff