lockphase 5 rokov pred
rodič
commit
5059078380

+ 5 - 4
gui/src/2D/controls/scrollViewers/scrollViewer.ts

@@ -35,7 +35,7 @@ export class ScrollViewer extends Rectangle {
     private _window: _ScrollViewerWindow;
     private _window: _ScrollViewerWindow;
     private _pointerIsOver: Boolean = false;
     private _pointerIsOver: Boolean = false;
     private _wheelPrecision: number = 0.05;
     private _wheelPrecision: number = 0.05;
-    private _onPointerObserver: Nullable<Observer<Vector2>>;
+    private _onWheelObserver: Nullable<Observer<Vector2>>;
     private _clientWidth: number;
     private _clientWidth: number;
     private _clientHeight: number;
     private _clientHeight: number;
     private _useImageBar: Boolean;
     private _useImageBar: Boolean;
@@ -648,11 +648,11 @@ export class ScrollViewer extends Rectangle {
 
 
     /** @hidden */
     /** @hidden */
     private _attachWheel() {
     private _attachWheel() {
-        if (!this._host || this._onPointerObserver) {
+        if (!this._host || this._onWheelObserver) {
             return;
             return;
         }
         }
 
 
-        this._onPointerObserver = this.onWheelObservable.add((pi) => {
+        this._onWheelObserver = this.onWheelObservable.add((pi) => {
             if (!this._pointerIsOver) {
             if (!this._pointerIsOver) {
                 return;
                 return;
             }
             }
@@ -687,7 +687,8 @@ export class ScrollViewer extends Rectangle {
 
 
     /** Releases associated resources */
     /** Releases associated resources */
     public dispose() {
     public dispose() {
-        this._onPointerObserver = null;
+        this.onWheelObservable.remove(this._onWheelObserver);
+        this._onWheelObserver = null;
         super.dispose();
         super.dispose();
     }
     }
 }
 }