diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index 344ce12..22dd2dc 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -2666,8 +2666,8 @@ //-------------------- if (this.badge) { this.removeChild(this.badge); - const width = this.width; - const height = this.height; + const width = this._width; + const height = this._height; this.addChild(this.badge); const badge = this.badge; @@ -3067,7 +3067,7 @@ }, opts ); - + this.opts.textStyle = Object.assign({}, theme.textStyle, this.opts.textStyle); this.opts.textStyleActive = Object.assign({}, theme.textStyleActive, this.opts.textStyleActive); @@ -3384,8 +3384,10 @@ * @param {*} event */ onStart(event) { - - if ((this.opts.maxWidth != null && this.__initWidth > this.opts.maxWidth) || (this.opts.maxHeight != null && this.__initHeight > this.opts.maxHeight)) { + if ( + (this.opts.maxWidth != null && this.__initWidth > this.opts.maxWidth) || + (this.opts.maxHeight != null && this.__initHeight > this.opts.maxHeight) + ) { this.__dragging = true; this.capture(event); @@ -3453,6 +3455,7 @@ // stack! const distanceToTop = this.container.y; const distanceToBottom = this.opts.maxHeight - this.container.y - this.__initHeight; + if (distanceToTop > 0) { throwProps.y.end = 0; } else if (distanceToBottom > 0) { @@ -3492,8 +3495,10 @@ * @param {*} event */ onScroll(event) { - - if ((this.opts.maxWidth != null && this.__initWidth > this.opts.maxWidth) || (this.opts.maxHeight != null && this.__initHeight > this.opts.maxHeight)) { + if ( + (this.opts.maxWidth != null && this.__initWidth > this.opts.maxWidth) || + (this.opts.maxHeight != null && this.__initHeight > this.opts.maxHeight) + ) { this.capture(event); if (this.opts.orientation === 'horizontal') { @@ -11189,6 +11194,8 @@ } } + /* eslint-disable no-unused-vars */ + /** A container for scatter objects, which uses a single InteractionMapper * for all children. This reduces the number of registered event handlers * and covers the common use case that multiple objects are scattered @@ -11519,8 +11526,6 @@ roundPixel(value) { // UO: Should be obsolete because Renderer supports roundPixels by default return value - let res = this.renderer.resolution; - return Math.round(value * res) / res } get container() { @@ -12336,7 +12341,7 @@ } } - /* global ThrowPropsPlugin */ + /* eslint-disable no-unused-vars */ class Ticks { get reservedPrefixes() { @@ -12730,6 +12735,7 @@ this.minZoom = 1; this.maxZoom = 12000; this.scroll = 0; + this.draggable = false; this.deltas = []; this.labelDates = []; this.colorRanges = []; @@ -13007,6 +13013,9 @@ return } this.scroll += delta.x; + if (this.draggable) { + this.y += delta.y; + } while (this.deltas.length > 10) { this.deltas.pop(0); } @@ -13022,7 +13031,6 @@ // let vel = ThrowPropsPlugin.getVelocity(this, 'delta') // ThrowPropsPlugin.untrack(this) // } - this.killTweens(); this.redraw(); let delta = 0; @@ -13035,7 +13043,6 @@ this.autoScroll = true; let anchor = interaction.current.mean(); this.keepInBounds(delta, anchor); - console.log("onEnd", delta); for (let key of interaction.ended.keys()) { if (interaction.isDoubleTap(key)) { this.onDoubleTap(event, interaction, key); diff --git a/doc/out/AbstractPopup.html b/doc/out/AbstractPopup.html index 871e50f..b7ce313 100644 --- a/doc/out/AbstractPopup.html +++ b/doc/out/AbstractPopup.html @@ -2918,7 +2918,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/Badge.html b/doc/out/Badge.html index fcce407..3bb36ce 100644 --- a/doc/out/Badge.html +++ b/doc/out/Badge.html @@ -2374,7 +2374,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/BlurFilter.html b/doc/out/BlurFilter.html index 811992e..73e8970 100644 --- a/doc/out/BlurFilter.html +++ b/doc/out/BlurFilter.html @@ -1798,7 +1798,7 @@ app.scene.filters = [blurFilter] diff --git a/doc/out/Button.html b/doc/out/Button.html index 525cd7f..bc7c972 100644 --- a/doc/out/Button.html +++ b/doc/out/Button.html @@ -3816,7 +3816,7 @@ the tint property of the icon sprite.

diff --git a/doc/out/ButtonGroup.html b/doc/out/ButtonGroup.html index be3653d..cf54f43 100644 --- a/doc/out/ButtonGroup.html +++ b/doc/out/ButtonGroup.html @@ -3578,7 +3578,7 @@ app.scene.addChild(buttonGroup) diff --git a/doc/out/DeepZoomImage.html b/doc/out/DeepZoomImage.html index 2a0a463..0599ca7 100644 --- a/doc/out/DeepZoomImage.html +++ b/doc/out/DeepZoomImage.html @@ -5096,7 +5096,7 @@ i.e. after loading a single tile

diff --git a/doc/out/DeepZoomInfo.html b/doc/out/DeepZoomInfo.html index 4a6dd09..57d0e00 100644 --- a/doc/out/DeepZoomInfo.html +++ b/doc/out/DeepZoomInfo.html @@ -2609,7 +2609,7 @@ on completion.

diff --git a/doc/out/Flippable.html b/doc/out/Flippable.html index 468502b..0c78dac 100644 --- a/doc/out/Flippable.html +++ b/doc/out/Flippable.html @@ -2512,7 +2512,7 @@ front.on('click', event => flippable.toggle()) diff --git a/doc/out/FontInfo.html b/doc/out/FontInfo.html index 5c11964..38cdc37 100644 --- a/doc/out/FontInfo.html +++ b/doc/out/FontInfo.html @@ -1559,7 +1559,7 @@ diff --git a/doc/out/Hypenate.html b/doc/out/Hypenate.html index cad289f..39ea656 100644 --- a/doc/out/Hypenate.html +++ b/doc/out/Hypenate.html @@ -1761,7 +1761,7 @@ diff --git a/doc/out/InteractivePopup.html b/doc/out/InteractivePopup.html index 9798e2f..0e0a6c4 100644 --- a/doc/out/InteractivePopup.html +++ b/doc/out/InteractivePopup.html @@ -2343,7 +2343,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/LabeledGraphics.exports.LabeledGraphics.html b/doc/out/LabeledGraphics.exports.LabeledGraphics.html index c2867b0..8451acc 100644 --- a/doc/out/LabeledGraphics.exports.LabeledGraphics.html +++ b/doc/out/LabeledGraphics.exports.LabeledGraphics.html @@ -1561,7 +1561,7 @@ diff --git a/doc/out/LabeledGraphics.html b/doc/out/LabeledGraphics.html index 623e0ca..0ec4242 100644 --- a/doc/out/LabeledGraphics.html +++ b/doc/out/LabeledGraphics.html @@ -2626,7 +2626,7 @@ than wanted

diff --git a/doc/out/List.html b/doc/out/List.html index d95b4eb..0370460 100644 --- a/doc/out/List.html +++ b/doc/out/List.html @@ -2585,7 +2585,7 @@ app.scene.addChild(list) diff --git a/doc/out/Message.html b/doc/out/Message.html index 1e0b9dd..b5c413c 100644 --- a/doc/out/Message.html +++ b/doc/out/Message.html @@ -2441,7 +2441,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/MessageInteractivePopup.html b/doc/out/MessageInteractivePopup.html index 9e01c35..6a132ef 100644 --- a/doc/out/MessageInteractivePopup.html +++ b/doc/out/MessageInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/MessageMessageInteractivePopup.html b/doc/out/MessageMessageInteractivePopup.html index d439bd5..c93037f 100644 --- a/doc/out/MessageMessageInteractivePopup.html +++ b/doc/out/MessageMessageInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/Modal.html b/doc/out/Modal.html index 4159322..53d4504 100644 --- a/doc/out/Modal.html +++ b/doc/out/Modal.html @@ -2342,7 +2342,7 @@ a string or a PIXI.Text object.

diff --git a/doc/out/ModalInteractivePopup.html b/doc/out/ModalInteractivePopup.html index 43d90b6..e755e36 100644 --- a/doc/out/ModalInteractivePopup.html +++ b/doc/out/ModalInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/ModalModalInteractivePopup.html b/doc/out/ModalModalInteractivePopup.html index 9a5a46a..66eac11 100644 --- a/doc/out/ModalModalInteractivePopup.html +++ b/doc/out/ModalModalInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PIXIApp.html b/doc/out/PIXIApp.html index 4fa348b..f6102ca 100644 --- a/doc/out/PIXIApp.html +++ b/doc/out/PIXIApp.html @@ -5743,7 +5743,7 @@ rejected with an error. diff --git a/doc/out/Popup.html b/doc/out/Popup.html index c385698..f7a3c35 100644 --- a/doc/out/Popup.html +++ b/doc/out/Popup.html @@ -2336,7 +2336,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/PopupInteractivePopup.html b/doc/out/PopupInteractivePopup.html index 68fcb58..8779b1e 100644 --- a/doc/out/PopupInteractivePopup.html +++ b/doc/out/PopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenu.html b/doc/out/PopupMenu.html index 38e2b50..707ee85 100644 --- a/doc/out/PopupMenu.html +++ b/doc/out/PopupMenu.html @@ -2390,7 +2390,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/PopupMenuPopupInteractivePopup.html b/doc/out/PopupMenuPopupInteractivePopup.html index 35dfbc7..b82c8a6 100644 --- a/doc/out/PopupMenuPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html b/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html index 462c70b..a4f04c8 100644 --- a/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html b/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html index 0492b32..bc9c457 100644 --- a/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupPopupInteractivePopup.html b/doc/out/PopupMenuPopupPopupInteractivePopup.html index ec7795a..dbf9dd8 100644 --- a/doc/out/PopupMenuPopupPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/PopupPopupInteractivePopup.html b/doc/out/PopupPopupInteractivePopup.html index 429fae3..119702a 100644 --- a/doc/out/PopupPopupInteractivePopup.html +++ b/doc/out/PopupPopupInteractivePopup.html @@ -1789,7 +1789,7 @@ like Popup, Message...

diff --git a/doc/out/Progress.html b/doc/out/Progress.html index 03ba6b7..d5b10e0 100644 --- a/doc/out/Progress.html +++ b/doc/out/Progress.html @@ -2875,7 +2875,7 @@ app.scene.addChild(progress) diff --git a/doc/out/Scrollview.html b/doc/out/Scrollview.html index 2b7714e..8862c40 100644 --- a/doc/out/Scrollview.html +++ b/doc/out/Scrollview.html @@ -1707,7 +1707,7 @@ app.loader diff --git a/doc/out/Slider.html b/doc/out/Slider.html index d16913c..ad8cdd0 100644 --- a/doc/out/Slider.html +++ b/doc/out/Slider.html @@ -2966,7 +2966,7 @@ app.scene.addChild(slider) diff --git a/doc/out/Switch.html b/doc/out/Switch.html index a95069a..b798b04 100644 --- a/doc/out/Switch.html +++ b/doc/out/Switch.html @@ -3396,7 +3396,7 @@ app.scene.addChild(switch1) diff --git a/doc/out/TextLabel.TextLabel.html b/doc/out/TextLabel.TextLabel.html index 88d1b74..884d5c9 100644 --- a/doc/out/TextLabel.TextLabel.html +++ b/doc/out/TextLabel.TextLabel.html @@ -1690,7 +1690,7 @@ diff --git a/doc/out/Theme.html b/doc/out/Theme.html index 93e87e1..c824413 100644 --- a/doc/out/Theme.html +++ b/doc/out/Theme.html @@ -3165,7 +3165,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeDark.html b/doc/out/ThemeDark.html index 35ce86e..c49c5bf 100644 --- a/doc/out/ThemeDark.html +++ b/doc/out/ThemeDark.html @@ -1586,7 +1586,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeLight.html b/doc/out/ThemeLight.html index 2789c7d..d16c866 100644 --- a/doc/out/ThemeLight.html +++ b/doc/out/ThemeLight.html @@ -1598,7 +1598,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeRed.html b/doc/out/ThemeRed.html index e3351f2..50c6d00 100644 --- a/doc/out/ThemeRed.html +++ b/doc/out/ThemeRed.html @@ -1598,7 +1598,7 @@ const app = new PIXIApp({ diff --git a/doc/out/TileQuadNode.html b/doc/out/TileQuadNode.html index 6e33f21..a3551e8 100644 --- a/doc/out/TileQuadNode.html +++ b/doc/out/TileQuadNode.html @@ -2050,7 +2050,7 @@ an indicator of tiles to free.

diff --git a/doc/out/Tooltip.html b/doc/out/Tooltip.html index b7ee308..d0e7429 100644 --- a/doc/out/Tooltip.html +++ b/doc/out/Tooltip.html @@ -2512,7 +2512,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/UITest.html b/doc/out/UITest.html index ead6eb8..38b4782 100644 --- a/doc/out/UITest.html +++ b/doc/out/UITest.html @@ -4183,7 +4183,7 @@ test.start() diff --git a/doc/out/Volatile.html b/doc/out/Volatile.html index c8e52dd..a9cf73c 100644 --- a/doc/out/Volatile.html +++ b/doc/out/Volatile.html @@ -2099,7 +2099,7 @@ app.scene.addChild(button) diff --git a/doc/out/global.html b/doc/out/global.html index ff8f547..71da6ac 100644 --- a/doc/out/global.html +++ b/doc/out/global.html @@ -3320,7 +3320,7 @@ diff --git a/doc/out/index.html b/doc/out/index.html index 4d9f41a..817bb14 100644 --- a/doc/out/index.html +++ b/doc/out/index.html @@ -1485,7 +1485,7 @@ diff --git a/doc/out/pixi_abstractpopup.js.html b/doc/out/pixi_abstractpopup.js.html index e6a4305..f5739e7 100644 --- a/doc/out/pixi_abstractpopup.js.html +++ b/doc/out/pixi_abstractpopup.js.html @@ -1808,7 +1808,7 @@ export default class AbstractPopup extends PIXI.Graphics { diff --git a/doc/out/pixi_app.js.html b/doc/out/pixi_app.js.html index 8646985..b22da33 100644 --- a/doc/out/pixi_app.js.html +++ b/doc/out/pixi_app.js.html @@ -2189,7 +2189,7 @@ class FpsDisplay extends PIXI.Graphics { diff --git a/doc/out/pixi_badge.js.html b/doc/out/pixi_badge.js.html index c6153d3..7e40f6f 100644 --- a/doc/out/pixi_badge.js.html +++ b/doc/out/pixi_badge.js.html @@ -1569,7 +1569,7 @@ export default class Badge extends AbstractPopup { diff --git a/doc/out/pixi_blurfilter.js.html b/doc/out/pixi_blurfilter.js.html index 4f19944..591471d 100644 --- a/doc/out/pixi_blurfilter.js.html +++ b/doc/out/pixi_blurfilter.js.html @@ -1727,7 +1727,7 @@ class TiltShiftYFilter extends TiltShiftAxisFilter { diff --git a/doc/out/pixi_button.js.html b/doc/out/pixi_button.js.html index ab03e23..d3fdc1f 100644 --- a/doc/out/pixi_button.js.html +++ b/doc/out/pixi_button.js.html @@ -1882,8 +1882,8 @@ export default class Button extends PIXI.Container { //-------------------- if (this.badge) { this.removeChild(this.badge) - const width = this.width - const height = this.height + const width = this._width + const height = this._height this.addChild(this.badge) const badge = this.badge @@ -2171,7 +2171,7 @@ export default class Button extends PIXI.Container { diff --git a/doc/out/pixi_buttongroup.js.html b/doc/out/pixi_buttongroup.js.html index e237973..59225e8 100644 --- a/doc/out/pixi_buttongroup.js.html +++ b/doc/out/pixi_buttongroup.js.html @@ -2174,7 +2174,7 @@ export default class ButtonGroup extends PIXI.Container { diff --git a/doc/out/pixi_deepzoom_image.js.html b/doc/out/pixi_deepzoom_image.js.html index 9fbfa9b..0f52010 100644 --- a/doc/out/pixi_deepzoom_image.js.html +++ b/doc/out/pixi_deepzoom_image.js.html @@ -2512,7 +2512,7 @@ export class DeepZoomImage extends PIXI.Container { diff --git a/doc/out/pixi_flippable.js.html b/doc/out/pixi_flippable.js.html index 3c24122..74a8d5c 100644 --- a/doc/out/pixi_flippable.js.html +++ b/doc/out/pixi_flippable.js.html @@ -1906,7 +1906,7 @@ export default class Flippable extends PIXI.projection.Camera3d { diff --git a/doc/out/pixi_labeledgraphics.js.html b/doc/out/pixi_labeledgraphics.js.html index 988fa8d..a272b7e 100644 --- a/doc/out/pixi_labeledgraphics.js.html +++ b/doc/out/pixi_labeledgraphics.js.html @@ -1855,7 +1855,7 @@ export class BitmapLabeledGraphics extends LabeledGraphics { diff --git a/doc/out/pixi_list.js.html b/doc/out/pixi_list.js.html index a3db605..7759be4 100644 --- a/doc/out/pixi_list.js.html +++ b/doc/out/pixi_list.js.html @@ -1834,7 +1834,7 @@ export default class List extends PIXI.Container { diff --git a/doc/out/pixi_message.js.html b/doc/out/pixi_message.js.html index 01f8a7a..6371178 100644 --- a/doc/out/pixi_message.js.html +++ b/doc/out/pixi_message.js.html @@ -1583,7 +1583,7 @@ export default class Message extends InteractivePopup { diff --git a/doc/out/pixi_modal.js.html b/doc/out/pixi_modal.js.html index d715c1b..5dc074f 100644 --- a/doc/out/pixi_modal.js.html +++ b/doc/out/pixi_modal.js.html @@ -1664,7 +1664,7 @@ export default class Modal extends PIXI.Container { diff --git a/doc/out/pixi_popup.js.html b/doc/out/pixi_popup.js.html index 344c2a7..b6c9956 100644 --- a/doc/out/pixi_popup.js.html +++ b/doc/out/pixi_popup.js.html @@ -1674,7 +1674,7 @@ export default class Popup extends InteractivePopup { diff --git a/doc/out/pixi_popupmenu.js.html b/doc/out/pixi_popupmenu.js.html index 58ecc4e..880aecb 100644 --- a/doc/out/pixi_popupmenu.js.html +++ b/doc/out/pixi_popupmenu.js.html @@ -1577,7 +1577,7 @@ export default class PopupMenu extends Popup { diff --git a/doc/out/pixi_progress.js.html b/doc/out/pixi_progress.js.html index f0da032..b5a4310 100644 --- a/doc/out/pixi_progress.js.html +++ b/doc/out/pixi_progress.js.html @@ -1759,7 +1759,7 @@ export default class Progress extends PIXI.Container { diff --git a/doc/out/pixi_scrollview.js.html b/doc/out/pixi_scrollview.js.html index affaa5b..fd005ad 100644 --- a/doc/out/pixi_scrollview.js.html +++ b/doc/out/pixi_scrollview.js.html @@ -1518,7 +1518,7 @@ export default class Scrollview extends Scrollbox { diff --git a/doc/out/pixi_slider.js.html b/doc/out/pixi_slider.js.html index addc267..6a7e2be 100644 --- a/doc/out/pixi_slider.js.html +++ b/doc/out/pixi_slider.js.html @@ -1923,7 +1923,7 @@ export default class Slider extends PIXI.Container { diff --git a/doc/out/pixi_switch.js.html b/doc/out/pixi_switch.js.html index 9b1cf54..157d208 100644 --- a/doc/out/pixi_switch.js.html +++ b/doc/out/pixi_switch.js.html @@ -1977,7 +1977,7 @@ export default class Switch extends PIXI.Container { diff --git a/doc/out/pixi_theme.js.html b/doc/out/pixi_theme.js.html index 35a531a..dc1ed85 100644 --- a/doc/out/pixi_theme.js.html +++ b/doc/out/pixi_theme.js.html @@ -1718,7 +1718,7 @@ export class ThemeRed extends Theme { diff --git a/doc/out/pixi_tooltip.js.html b/doc/out/pixi_tooltip.js.html index a310d8c..f680371 100644 --- a/doc/out/pixi_tooltip.js.html +++ b/doc/out/pixi_tooltip.js.html @@ -1611,7 +1611,7 @@ export default class Tooltip extends AbstractPopup { diff --git a/doc/out/pixi_volatile.js.html b/doc/out/pixi_volatile.js.html index 6595e4f..8dcbacc 100644 --- a/doc/out/pixi_volatile.js.html +++ b/doc/out/pixi_volatile.js.html @@ -1615,7 +1615,7 @@ export default class Volatile { diff --git a/doc/out/uitest.js.html b/doc/out/uitest.js.html index b40d559..ff1b09f 100644 --- a/doc/out/uitest.js.html +++ b/doc/out/uitest.js.html @@ -2466,7 +2466,7 @@ class Event { diff --git a/lib/pixi/button.js b/lib/pixi/button.js index 4af4be0..00e3ecb 100644 --- a/lib/pixi/button.js +++ b/lib/pixi/button.js @@ -436,8 +436,8 @@ export default class Button extends PIXI.Container { //-------------------- if (this.badge) { this.removeChild(this.badge) - const width = this.width - const height = this.height + const width = this._width + const height = this._height this.addChild(this.badge) const badge = this.badge diff --git a/lib/pixi/buttongroup.js b/lib/pixi/buttongroup.js index f312e4a..6ec72ad 100644 --- a/lib/pixi/buttongroup.js +++ b/lib/pixi/buttongroup.js @@ -514,7 +514,7 @@ export default class ButtonGroup extends PIXI.Container { // stack! const distanceToTop = this.container.y const distanceToBottom = this.opts.maxHeight - this.container.y - this.__initHeight - + if (distanceToTop > 0) { throwProps.y.end = 0 } else if (distanceToBottom > 0) {