From 97d33cf17763e8ca7bd2471269e41728908abda3 Mon Sep 17 00:00:00 2001 From: Sebastian Kupke Date: Thu, 8 Aug 2019 13:46:02 +0200 Subject: [PATCH] Fixed theming bug in button and button group. --- dist/iwmlib.pixi.js | 14 +- doc/out/AbstractPopup.html | 8 +- doc/out/Badge.html | 8 +- doc/out/BlurFilter.html | 8 +- doc/out/Button.html | 16 +- doc/out/ButtonGroup.html | 232 +----------------- doc/out/DeepZoomImage.html | 60 ++--- doc/out/DeepZoomInfo.html | 20 +- doc/out/Flippable.html | 8 +- doc/out/FontInfo.html | 8 +- doc/out/Hypenate.html | 8 +- doc/out/InteractivePopup.html | 8 +- ...beledGraphics.exports.LabeledGraphics.html | 8 +- doc/out/LabeledGraphics.html | 8 +- doc/out/List.html | 8 +- doc/out/Message.html | 8 +- doc/out/MessageInteractivePopup.html | 8 +- doc/out/MessageMessageInteractivePopup.html | 8 +- doc/out/Modal.html | 8 +- doc/out/ModalInteractivePopup.html | 8 +- doc/out/ModalModalInteractivePopup.html | 8 +- doc/out/PIXIApp.html | 8 +- doc/out/Popup.html | 8 +- doc/out/PopupInteractivePopup.html | 8 +- doc/out/PopupMenu.html | 8 +- doc/out/PopupMenuPopupInteractivePopup.html | 8 +- ...pupMenuPopupMenuPopupInteractivePopup.html | 8 +- ...nuPopupMenuPopupPopupInteractivePopup.html | 8 +- .../PopupMenuPopupPopupInteractivePopup.html | 8 +- doc/out/PopupPopupInteractivePopup.html | 8 +- doc/out/Progress.html | 8 +- doc/out/Scrollview.html | 8 +- doc/out/Slider.html | 8 +- doc/out/Switch.html | 8 +- doc/out/TextLabel.TextLabel.html | 8 +- doc/out/Theme.html | 8 +- doc/out/ThemeDark.html | 8 +- doc/out/ThemeLight.html | 8 +- doc/out/ThemeRed.html | 8 +- doc/out/TileQuadNode.html | 16 +- doc/out/Tooltip.html | 8 +- doc/out/UITest.html | 8 +- doc/out/Volatile.html | 8 +- doc/out/global.html | 8 +- doc/out/index.html | 8 +- doc/out/pixi_abstractpopup.js.html | 8 +- doc/out/pixi_app.js.html | 8 +- doc/out/pixi_badge.js.html | 8 +- doc/out/pixi_blurfilter.js.html | 8 +- doc/out/pixi_button.js.html | 15 +- doc/out/pixi_buttongroup.js.html | 117 +++++---- doc/out/pixi_deepzoom_image.js.html | 99 ++------ doc/out/pixi_flippable.js.html | 8 +- doc/out/pixi_labeledgraphics.js.html | 8 +- doc/out/pixi_list.js.html | 8 +- doc/out/pixi_message.js.html | 8 +- doc/out/pixi_modal.js.html | 8 +- doc/out/pixi_popup.js.html | 8 +- doc/out/pixi_popupmenu.js.html | 8 +- doc/out/pixi_progress.js.html | 8 +- doc/out/pixi_scrollview.js.html | 8 +- doc/out/pixi_slider.js.html | 8 +- doc/out/pixi_switch.js.html | 8 +- doc/out/pixi_theme.js.html | 8 +- doc/out/pixi_tooltip.js.html | 8 +- doc/out/pixi_volatile.js.html | 8 +- doc/out/uitest.js.html | 8 +- lib/pixi/button.html | 14 +- lib/pixi/button.js | 7 +- lib/pixi/buttongroup.html | 3 + lib/pixi/buttongroup.js | 21 +- lib/pixi/theme.html | 1 + 72 files changed, 255 insertions(+), 844 deletions(-) diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index e4bf418..44ac09b 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -2366,8 +2366,8 @@ strokeActive: theme.strokeActive, strokeActiveWidth: theme.strokeActiveWidth, strokeActiveAlpha: theme.strokeActiveAlpha, - textStyle: theme.textStyle, - textStyleActive: theme.textStyleActive, + textStyle: {}, + textStyleActive: {}, style: 'default', radius: theme.radius, disabled: false, @@ -2387,6 +2387,9 @@ this.id = this.opts.id; + this.opts.textStyle = Object.assign({}, theme.textStyle, this.opts.textStyle); + this.opts.textStyleActive = Object.assign({}, theme.textStyleActive, this.opts.textStyleActive); + if (typeof this.opts.icon === 'undefined' && typeof this.opts.iconActive !== 'undefined') { this.opts.icon = this.opts.iconActive; } else if (typeof this.opts.icon !== 'undefined' && typeof this.opts.iconActive === 'undefined') { @@ -3051,8 +3054,8 @@ strokeActive: theme.strokeActive, strokeActiveWidth: theme.strokeActiveWidth, strokeActiveAlpha: theme.strokeActiveAlpha, - textStyle: theme.textStyle, - textStyleActive: theme.textStyleActive, + textStyle: {}, + textStyleActive: {}, style: 'default', radius: theme.radius, disabled: null, @@ -3064,6 +3067,9 @@ }, opts ); + + this.opts.textStyle = Object.assign({}, theme.textStyle, this.opts.textStyle); + this.opts.textStyleActive = Object.assign({}, theme.textStyleActive, this.opts.textStyleActive); this.buttons = []; diff --git a/doc/out/AbstractPopup.html b/doc/out/AbstractPopup.html index 53f6f81..871e50f 100644 --- a/doc/out/AbstractPopup.html +++ b/doc/out/AbstractPopup.html @@ -267,10 +267,6 @@ Methods -
  • _stackHorizontal
    • - -
  • _stackVertical
    • -
  • capture
  • hide
    • @@ -279,8 +275,6 @@
  • show
    • -
  • stack
    • -