@babylonjs/gui
Advanced tools
Comparing version 4.0.0-alpha.22 to 4.0.0-alpha.24
@@ -773,3 +773,3 @@ import * as tslib_1 from "tslib"; | ||
if (_this._lastControlOver[pointerId]) { | ||
_this._lastControlOver[pointerId]._onPointerOut(_this._lastControlOver[pointerId]); | ||
_this._lastControlOver[pointerId]._onPointerOut(_this._lastControlOver[pointerId], true); | ||
} | ||
@@ -776,0 +776,0 @@ delete _this._lastControlOver[pointerId]; |
@@ -49,3 +49,3 @@ import { Nullable } from "@babylonjs/core/types"; | ||
/** @hidden */ | ||
_onPointerOut(target: Control): void; | ||
_onPointerOut(target: Control, force?: boolean): void; | ||
/** @hidden */ | ||
@@ -52,0 +52,0 @@ _onPointerDown(target: Control, coordinates: Vector2, pointerId: number, buttonIndex: number): boolean; |
@@ -86,7 +86,8 @@ import * as tslib_1 from "tslib"; | ||
/** @hidden */ | ||
Button.prototype._onPointerOut = function (target) { | ||
Button.prototype._onPointerOut = function (target, force) { | ||
if (force === void 0) { force = false; } | ||
if (this.pointerOutAnimation) { | ||
this.pointerOutAnimation(); | ||
} | ||
_super.prototype._onPointerOut.call(this, target); | ||
_super.prototype._onPointerOut.call(this, target, force); | ||
}; | ||
@@ -93,0 +94,0 @@ /** @hidden */ |
@@ -501,3 +501,3 @@ import { Nullable } from "@babylonjs/core/types"; | ||
/** @hidden */ | ||
_onPointerOut(target: Control): void; | ||
_onPointerOut(target: Control, force?: boolean): void; | ||
/** @hidden */ | ||
@@ -504,0 +504,0 @@ _onPointerDown(target: Control, coordinates: Vector2, pointerId: number, buttonIndex: number): boolean; |
@@ -374,2 +374,6 @@ import * as tslib_1 from "tslib"; | ||
cell.height = heights[x] + "px"; | ||
cell._left.ignoreAdaptiveScaling = true; | ||
cell._top.ignoreAdaptiveScaling = true; | ||
cell._width.ignoreAdaptiveScaling = true; | ||
cell._height.ignoreAdaptiveScaling = true; | ||
} | ||
@@ -376,0 +380,0 @@ }); |
@@ -18,2 +18,3 @@ import { Observable } from "@babylonjs/core/Misc/observable"; | ||
protected _displayThumb: boolean; | ||
private _step; | ||
protected _effectiveBarOffset: number; | ||
@@ -31,2 +32,4 @@ protected _renderLeft: number; | ||
displayThumb: boolean; | ||
/** Gets or sets a step to apply to values (0 by default) */ | ||
step: number; | ||
/** Gets or sets main bar offset (ie. the margin applied to the value bar) */ | ||
@@ -33,0 +36,0 @@ barOffset: string | number; |
@@ -25,2 +25,3 @@ import * as tslib_1 from "tslib"; | ||
_this._displayThumb = true; | ||
_this._step = 0; | ||
// Shared rendering info | ||
@@ -50,2 +51,17 @@ _this._effectiveBarOffset = 0; | ||
}); | ||
Object.defineProperty(BaseSlider.prototype, "step", { | ||
/** Gets or sets a step to apply to values (0 by default) */ | ||
get: function () { | ||
return this._step; | ||
}, | ||
set: function (value) { | ||
if (this._step === value) { | ||
return; | ||
} | ||
this._step = value; | ||
this._markAsDirty(); | ||
}, | ||
enumerable: true, | ||
configurable: true | ||
}); | ||
Object.defineProperty(BaseSlider.prototype, "barOffset", { | ||
@@ -257,8 +273,11 @@ /** Gets or sets main bar offset (ie. the margin applied to the value bar) */ | ||
} | ||
var value; | ||
if (this._isVertical) { | ||
this.value = this._minimum + (1 - ((y - this._currentMeasure.top) / this._currentMeasure.height)) * (this._maximum - this._minimum); | ||
value = this._minimum + (1 - ((y - this._currentMeasure.top) / this._currentMeasure.height)) * (this._maximum - this._minimum); | ||
} | ||
else { | ||
this.value = this._minimum + ((x - this._currentMeasure.left) / this._currentMeasure.width) * (this._maximum - this._minimum); | ||
value = this._minimum + ((x - this._currentMeasure.left) / this._currentMeasure.width) * (this._maximum - this._minimum); | ||
} | ||
var mult = (1 / this._step) | 0; | ||
this.value = this._step ? ((value * mult) | 0) / mult : value; | ||
}; | ||
@@ -265,0 +284,0 @@ BaseSlider.prototype._onPointerDown = function (target, coordinates, pointerId, buttonIndex) { |
@@ -1,2 +0,3 @@ | ||
import { Vector2, Polygon } from "@babylonjs/core"; | ||
import { Vector2 } from "@babylonjs/core/Maths/math"; | ||
import { Polygon } from "@babylonjs/core/Meshes/polygonMesh"; | ||
/** | ||
@@ -3,0 +4,0 @@ * Class used to store 2D control sizes |
@@ -57,5 +57,6 @@ import { AdvancedDynamicTexture } from "./advancedDynamicTexture"; | ||
* @param host defines the root host | ||
* @param decimals defines an optional number of decimals to display | ||
* @returns a string | ||
*/ | ||
toString(host: AdvancedDynamicTexture): string; | ||
toString(host: AdvancedDynamicTexture, decimals?: number): string; | ||
/** | ||
@@ -62,0 +63,0 @@ * Store a value parsed from a string |
@@ -107,10 +107,13 @@ /** | ||
* @param host defines the root host | ||
* @param decimals defines an optional number of decimals to display | ||
* @returns a string | ||
*/ | ||
ValueAndUnit.prototype.toString = function (host) { | ||
ValueAndUnit.prototype.toString = function (host, decimals) { | ||
switch (this.unit) { | ||
case ValueAndUnit.UNITMODE_PERCENTAGE: | ||
return (this.getValue(host) * 100) + "%"; | ||
var percentage = this.getValue(host) * 100; | ||
return (decimals ? percentage.toFixed(decimals) : percentage) + "%"; | ||
case ValueAndUnit.UNITMODE_PIXEL: | ||
return this.getValue(host) + "px"; | ||
var pixels = this.getValue(host); | ||
return (decimals ? pixels.toFixed(decimals) : pixels) + "px"; | ||
} | ||
@@ -117,0 +120,0 @@ return this.unit.toString(); |
@@ -7,3 +7,3 @@ { | ||
"description": "The Babylon.js GUI library is an extension you can use to generate interactive user interface. It is build on top of the DynamicTexture.", | ||
"version": "4.0.0-alpha.22", | ||
"version": "4.0.0-alpha.24", | ||
"repository": { | ||
@@ -198,3 +198,3 @@ "type": "git", | ||
"dependencies": { | ||
"@babylonjs/core": "4.0.0-alpha.22", | ||
"@babylonjs/core": "4.0.0-alpha.24", | ||
"tslib": "^1.9.3" | ||
@@ -201,0 +201,0 @@ }, |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1637701
17492
+ Added@babylonjs/core@4.0.0-alpha.24(transitive)
- Removed@babylonjs/core@4.0.0-alpha.22(transitive)