From fbdcc0686289d9558378efdb3549cb9f05521893 Mon Sep 17 00:00:00 2001 From: fgnm Date: Tue, 7 Jul 2020 21:29:43 +0200 Subject: [PATCH] Refactor additional component UI --- .../expandable-properties-active-bg.9.png | Bin 1182 -> 6457 bytes assets/style/uiskin.json | 3 +++ assets/style/uiskin.png | Bin 146451 -> 146421 bytes .../editor/utils/StandardWidgetsFactory.java | 6 ++++++ .../view/ui/box/UILayerBoxMediator.java | 2 +- .../UIItemCollapsibleProperties.java | 4 ++-- .../ui/properties/UIRemovableProperties.java | 19 +++++++++++++----- .../panels/UIPhysicsProperties.java | 2 +- 8 files changed, 27 insertions(+), 9 deletions(-) diff --git a/art/textures/expandable-properties-active-bg.9.png b/art/textures/expandable-properties-active-bg.9.png index 684f11ac0890228038100167f94f9589aa8194bc..d254c758732e25552bd2148fe809f73ca5edc73f 100644 GIT binary patch literal 6457 zcmeHMdpwl+8lPN-w6>&;TxyKgZOqjSGjmK~j10yt#1?vI<{c(;Gc%fzk|YO7*;Bgd z!m3m#5!u}esnkkGHgdO;cDsme%eKOKXGl7yZBL)iIsY}hc%R?*`9AOSeV^y~y`NXQ zzwZitJrg|`45rWYbPt4n!=b}aSM{^3b>mv-+-pNns5}r*AS6;Tk1qfb@^}e|0F`_m z45n-^UKMlB!B%(dnH_Joeny{kW5}(~d9P$=S)%Ue4_XRPzlZ{QC9oZ)6R&Aqk-wj< z>rGy|gK|yt$S(RovJS1$FXFO1GMd(r9~O_y zEzLAy44+Tx2Rb8f4HW~IkC>%C(<+W!l&JS>Zumnp>u={HktPa{;=)Gd&Pd!G>auq z@^9RT>baO)b?r+0PTa5h-BgOuK~W?`1#%Fir>+eUYx zt+5>frR6$aaI`)T8Ihdk&dm2cxBF*K+I)^r(}6Y2W!sk89^XxT5cFe=e^VhdxGblk z?He7hEDCswvbVOR+J8$)@+)o2J*Us)dF>zt7gyz^{>IN^Zby@ZReKt{6y@oQ6CSn8 zuvZN zzI9|xj+t(zH3v5P*0r|01sbNZYi-$!7#5#dU%e1}C=>5*3@`QhRyuN}bII_4`$U@4 zICda6U}Q7yp-Y#87#sSy;`aHg_rkUuZiS z=jQo*sc*j+b-?pXVnfExb4aPDq&FN^$#*#Jcyn#`6_R&ezT@zqyM;-^^O% zHT*eO7PzR}sd`-~&dd52U$2~_=8M=YS-ywuA9$t0Hd6I`$SMWx%m?3t~lPgIg**K`>u$XLj(ep#z3#webF& zm_pl7t=VHC@Rt>cJl)=><>cRUB@Ra{=VzKcqUfd{^!y`L_|IY|=`X8-}yQ?CMDhH94nT_oxdiBez4jbGSb(H3Jb(o&& z|85qVJ8MNuqhF!hUF(vC19MWokd>AV#P`4k)(^LB9x+cE8UOAX z?E8_PO**|7Ck8E(sN_pX7fk+=i7o}~@YwB+%?h2hVfn93k~S`_R%1k(y~gKXbWrQH zPk0MjjP|=Sm-{cyzR=@F$u2<6AJO`9EFSZ~)UI<52IkTOEA;;D=2RF|Qs`?D-+%i; z(Jhf&&_zZO%TZ=?FJvY92=Co<%d7~d59d%`Yri;lOY`M{J|Fg}o7JXSVHbB>Rpzg( zCX?$qoVb=SVOhtaJts6q&u=+A=CIeq``C|-JF<7aus+$MX*kN(*zr_*(J!*_{=Ksl z_P2F0y%B8XJu@=D#%hUK*5`Y>YUX8nkrDQx8*>vz%~LC3oz_~`Pb*hzc3vMwH*k*W z!iKhKRKDI^Rn--Eb}VwRCs3kYEqXOkT^%#Ay!HHd3)Y8wE;Rbd>Xo=uu(UGhwM*=g zs^9b2eUV9PA9(NcxO}5W)cVSq|NY;h>rO`59K9Q!wcu>%9~CyJ%ICpaxD!Kk->RNj z@z;Jz)ahUJ_fhj*QD%b*m&36a)W-37_2=4$uuq!$9}Jc(TN`%UvuN`ya0LPG<-58X z2Ag+?5A7HaM4ZcB~4KW-F7rA_yp0kn)5ePv!fKUnrA{kXlL#lbH(BCRE7Ku

$_i zX%rSup-`|m0+v8PLkP4iUL*&UXpziPMKQ_Y4$3%EzC_L!ix4VKfGv)b(~wAL9Wg}? zt#TMj$T$^1b*`qD$+=i2bV7vkfdE(n4o61g2xtNYJJTOpWwEBcMY1UsAw985K!U|% za9E-69S@nDvHoqm_j<^Jpv@f{2+G89QVz&i4~pcLGlR~VgFqnT@eHCX-j(i# zqcBKh9EIdWcAeqQ6v^a(hy%WH=R@vf9@ohUBvH@~JRSv2B!W0Jn}l~jg`boU^#dSy-<9Ag0Ey_p1JQU#9uZBXK=nfAI+D<2Cr3vD01!bEfvBcZiAiQU)Z5RilJ&;dE&@FX-2`X&b9aa1CX zild-#L@I8QW*RM)28qQ28d8-3LKSG5j0Lqf7mx$*r6W)si2p{%5_9>y_`gD{ni=6d z)uvP*F$Yk!^W=qd)r*t8?gm6*C$ZQMf&YVPWwcl!`tNw&LZ?|=rE-N>8sjJRW3K}_ z@(=U84?N8j2u)d;TpG{(i=_Sy=RDaKo{+Ct8b2fcN-%cvY*HQpUp@2?2=(}(0vwf! zG^7kz4|3Ia5K?(^i4zToqCjZQPxa^kE8`>*0UwmUd&Axo@SotE-`dsnFaAsSnXpN3x>ynq4X|jrpF;G(@b3Xm zGWhU0ph)(?*fSxMw`;~u45d72gLZi6fdM=H#4uH^s=fLD_?c>h|6>G*`csgP()W{G zpXB-|1wIP=sk%PN^-&6Z6!=qh{myFqQ+tl*WCT&mx2DlkA8}oS>H<#tr|9K{MBlCHzq34=?HRbnOuIFC z>+=Us4%~HsM}I5iHQVAN zLk+H+(QVGO$k^3j&k6aOFk~J%qB}H(xl#7|@wnO8x+b=Z%hJO@D&O#op`WlF{%}(t z`EuxWimjUngE-q5na^W=lN7WH8tq zL)9@0b|BXnGU~{gEQU_Mj*g)L{HA?oHe_;Qy1ND$H*?myBu#h<;2v=3V{L7{pk~wP zOFRMJ3$ycdr)A`UfM^`PVDQAPN|h;p<-Fwl?`+nd_b1 delta 560 zcmdmKG>>zFvO0rgiEBhjaDG}zd16s2gJVj5QmTSyZen_BP-se zx3cR^*5a@=QK-l*uyQU+O)SYT3dzsUu~mY&A|NBbB)>Q#zd*s+8EmV9MtEjkN`85< zrqbk6E^ThGM&JCD%(TkM4P2rUMpniq+6E?81_nwHsnn9hl*E!mkfbKEWJxBtj1EMHY}8fYqmr>mdKI;Vst0I%7zO8@`> diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json index 79dba15a..5cb9a27c 100644 --- a/assets/style/uiskin.json +++ b/assets/style/uiskin.json @@ -447,6 +447,9 @@ up: button-panel-bg, imageUp: icon-close-white }, + close-properties: { + imageUp: icon-close-white + }, trash-button: { imageDown: icon-trash-disabled, imageOver: icon-trash-over, diff --git a/assets/style/uiskin.png b/assets/style/uiskin.png index 9601fc04c264bb93212ca9667ec98f1de4c8b469..9ca86b4eaf78d3411202255b43b479a14ddac684 100644 GIT binary patch delta 12734 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 J%g#96`d?DagE0UA delta 12764 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 { if(deletingLayerIndex != -1) { String layerName = layers.get(deletingLayerIndex).layerName; Dialogs.showConfirmDialog(sandbox.getUIStage(), - "Delete Layer", "Do you realy want to delete '" + layerName + "' layer?", + "Delete Layer", "Do you really want to delete '" + layerName + "' layer?", new String[]{"Cancel", "Delete"}, new Integer[]{0, 1}, r -> { if (r == 1) { facade.sendNotification(MsgAPI.ACTION_DELETE_LAYER, layerName); diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java index 46d756fb..7667d61f 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/UIItemCollapsibleProperties.java @@ -49,8 +49,8 @@ public abstract class UIItemCollapsibleProperties extends UIItemProperties { header = new VisTable(); header.setBackground(VisUI.getSkin().getDrawable("expandable-properties-active-bg")); header.add(StandardWidgetsFactory.createLabel(title)).right().expandX().padRight(6); - VisImageButton button = new VisImageButton("expandable-properties-button"); - header.add(button).padRight(3); + VisImageButton button = StandardWidgetsFactory.createImageButton("expandable-properties-button"); + header.add(button).padRight(8); header.addListener(new ClickListener() { @Override public void clicked(InputEvent event, float x, float y) { diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java index 8176752c..12d6a6bb 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/UIRemovableProperties.java @@ -4,9 +4,12 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.kotcrab.vis.ui.VisUI; +import com.kotcrab.vis.ui.util.dialog.Dialogs; import com.kotcrab.vis.ui.widget.VisImageButton; import com.kotcrab.vis.ui.widget.VisTable; import games.rednblack.editor.utils.StandardWidgetsFactory; +import games.rednblack.editor.view.stage.Sandbox; +import games.rednblack.h2d.common.MsgAPI; /** * Created by CyberJoe on 7/2/2015. @@ -21,11 +24,11 @@ public abstract class UIRemovableProperties extends UIItemCollapsibleProperties public Table crateHeaderTable() { VisTable header = new VisTable(); header.setBackground(VisUI.getSkin().getDrawable("expandable-properties-active-bg")); - VisImageButton collapseButton = new VisImageButton("expandable-properties-button"); - VisImageButton closeButton = new VisImageButton("close-panel"); + VisImageButton collapseButton = StandardWidgetsFactory.createImageButton("expandable-properties-button"); + VisImageButton closeButton = StandardWidgetsFactory.createImageButton("close-properties"); header.add(closeButton).left().padLeft(2); header.add(StandardWidgetsFactory.createLabel(title)).left().expandX().padLeft(6); - header.add(collapseButton).right().padRight(3); + header.add(collapseButton).right().padRight(8); header.addListener(new ClickListener() { @Override public void clicked(InputEvent event, float x, float y) { @@ -38,8 +41,14 @@ public abstract class UIRemovableProperties extends UIItemCollapsibleProperties @Override public void clicked(InputEvent event, float x, float y) { super.clicked(event, x, y); - onRemove(); - remove(); + Dialogs.showConfirmDialog(Sandbox.getInstance().getUIStage(), + "Delete Component", "Do you want to delete this component?", + new String[]{"Cancel", "Delete"}, new Integer[]{0, 1}, r -> { + if (r == 1) { + onRemove(); + remove(); + } + }).padBottom(20).pack(); } }); return header; diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java index cc70a04d..f52950b6 100644 --- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java +++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIPhysicsProperties.java @@ -21,7 +21,7 @@ public class UIPhysicsProperties extends UIRemovableProperties { public static final String prefix = "games.rednblack.editor.view.ui.properties.panels.UIPhysicsProperties"; public static final String CLOSE_CLICKED = prefix + ".CLOSE_CLICKED"; - private HashMap bodyTypes = new HashMap<>(); + private final HashMap bodyTypes = new HashMap<>(); private VisSelectBox bodyTypeBox; private VisValidatableTextField massField;