From ba05dbf0c1775404a0d2b51128558a6c436726b6 Mon Sep 17 00:00:00 2001 From: Recrown Date: Thu, 20 Apr 2017 20:07:39 -0500 Subject: [PATCH] made ui changes, cont. work on music selection --- android/assets/uiskin.atlas | 11 +--- android/assets/uiskin.png | Bin 4585 -> 7146 bytes core/src/zero1hd/polyjet/Polyjet.java | 15 ++---- .../polyjet/screens/PreGameScreen.java | 14 ++--- .../polyjet/ui/builders/GraphicsTable.java | 11 ++-- .../polyjet/ui/pages/MoreOptionsPage.java | 48 ++++++++++-------- .../polyjet/ui/pages/MusicSelectionPage.java | 14 ++--- .../zero1hd/polyjet/ui/pages/OptionsPage.java | 34 +++++-------- .../polyjet/ui/windows/MusicSelector.java | 2 +- 9 files changed, 65 insertions(+), 84 deletions(-) mode change 100755 => 100644 android/assets/uiskin.png diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index 4c94c56..0524663 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -99,7 +99,7 @@ default-round-down orig: 12, 20 offset: 0, 0 index: -1 -default-round-large +default-scroll rotate: false xy: 57, 29 size: 20, 20 @@ -107,7 +107,7 @@ default-round-large orig: 20, 20 offset: 0, 0 index: -1 -default-scroll +default-round-large rotate: false xy: 78, 29 size: 20, 20 @@ -244,13 +244,6 @@ left-button-down orig: 12, 20 offset: 0, 0 index: -1 -goto - rotate: false - xy: 1, 123 - size: 101, 132 - orig: 101, 132 - offset: 0, 0 - index: -1 arrow rotate: false xy: 91, 50 diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png old mode 100755 new mode 100644 index 168ae31066561901dcb0a7b6dfa5d169c3ab90b3..70cf9179599b2ad9f27cdf408bf051e9d86b6b5a GIT binary patch literal 7146 zcmeHMXH-*Nvp$Id69t9PdxS`lDoT+ep~EXpdT)Z%&;ueZ0R*Imu2PIBy+{X<5u9M`USYlh005=BnvyO6 zfJl!Z07_1}nR^vHzL30iRTY4;e%56GV0ovmB(MJjw4PJ7{0$2;7q2Of|B6zGms&CuU=j zD9WIQg*fw+XFS=OixGZ0oUffe;&|V8&Dgy^^WLmfXvp?l$53tEbg;DPs32k~5yE&X zB_+UxJBBI2fYv`_Rw0y6svmX67f`4MiY=XRVI2d!qH>;E(g$j-w?el63>8tG)BLwb|eZTr|{}2Y~DwSp_Zp z^#7IRL9Kd@lXDHDNJc3)bvdgcctFJv0{Nfc19BYKPB446EXmk-ie5E>38Vy$Wj(42 zwR)A$4dUaMOmO4N8y`Xs$Y{dWmVESob014Fji^kfW7hBRxdePvZ3`)m!6IzorwV1l zFIh&HEX(6J1F-%F?tR(*(eDPz$zXqZ(YpSERKV&%yfBKo+)d%w&j% zn99HrVL0~n$MRz;K<>V-++m_XPK%ua?+A{ZktdAYCsdK)1;E<&jt}n00^$bR+4bTB z)#IiLV!>UA?|bW3*J*&MUFoyk;U-Jr;E7mF%A=2W#p+w!13i0H4A&&k@mcpDbu#$1 zBL_#6P~>0xerBk0VI8vl^CaA-8hK%e!-{w>C*LgumD{B`KH?j7KotM%THZ*p(a8?a z{;T^&U^!d->>WEP31&oCEc+%gj~7G`OoI4MqU&%oo%=KLglu)VP8f&O-~tJJgEHU> z2ylRhgkBH)6n|PY=?sVV+=eqACUeP!S>5ckhdZ)^*1dt1doBI;$;4}RwnbwWer&4X z+nnY%NErGACqC!NmfZbu|9$W4kn;~hAmr+B_k3w(dG?OTbyv#Yg02syIwP-2nOirAp{ztR*Dji7~$!ugodY(kpsclAOMeP;dj+paQ@L)g>O`#;>2g(-?iK zA@@M%d)_eLuF~t(8Kb~buSANXcNTgULl#)(m9d+kd&l7$1#f{%e|&HhVkr)q6;gEa z5Tb~MvP|uZ$9K5Dh0=*S%Jb0qKHLD)ir@W>5W=49if*LXIITtRUjEMpfhFYq9Zd zX<4@{6k{oPc3^(u{);kWek*@vw zvM}$xWrN0Fh~b`8{#;7k6qob0ssV1ML%lo=Tq)>;MZzt%=0TyzH&`vda`t6uCaK#d zWwGqI1~_(Yyqj&>;5t!gMeQoR(O!y;D%hl#8|r99Ggv5va}_S+YMCjK6h6aoqMM=x z7^Ia5Wgh{Q@qWBv?U|@=*f&&K&oL;@0A}jKb{hNf^tna9YBDMdM&R{?VRL+$a}xlL zMf|N{jyaZPR2mJe0J0)QrW4dvCD591G?*o)O=dAVWPZriF68$_Wpd&LfIQ4K(Euy7 zc?q@by~vFaMlCo05%JqF51Fh*PxWU>>y30KaBK#hZg*bl&W&<&w*P^TK~2I@qKCOd z7wbHPS`$8UwPwZP5YLzvhTRU8m(<7`qRU~MR z0bfI{)F>u}ytw2fV8JK_TU01a@O zZGt8YP))Q6*??gNIl-o~JKC@Ac88F*^%fFspYmqe8BUanII{{qviDI^{a)^LvcLXD z?N!m=X%Cu>#NOWbvyKPhorv@@jW+kV`i$+Ql*Xq zIdCWjKVc9E;7vvcefKaMz4xa)jc$nTamM6tYA6jL_4sE4#?VAo8$*^Hs~&o*iPC@K zr(G6{TRjLQN2KqzZVQJ^(P+yI*&QsK$%E0-WL?feVRA8AJ+%m;-UoYh*gd9({64)R ziWmd7#NpI#@&4W$gLx1D>?G}C>VNN>V=6>Sfq;eqt@^m&Qc7>_FIlqN21V>-cSB{5(xJhg z0$&rsFJ0g&Z>;=-H=7QgKKdNHP2x%J*xVxAJv;oa+|hh;IY;!;`TnH)6pMS~PZDX@!|Qp^nzY_FYb`1RoB0ptF;i^O3r#TasVjNCqVw} z^a@uNW&N!`_cq~v^s#*S&eB|0!pyXL%UL5SlN@;9blGa6(ETJ@Ar%(_uo*S;-GSJl{maGxX?>>o`Kiqr13X8bQ>|5K<_hzIa=idtT&Vu&8^PFbLg`9U)I66nt zuR~daSWMW2htfZ2eSY^vWm?71$gg0!<$ZkJ^6BdPmgWLY3)wh6#hj}`j5%?IA+2Mn z(tU*6SvE6jL-FN9b%`S%gpNhWx?iMxUz+S%S-G}%69fSpZ`yGZA6iaC-b*4z)A2{| zT-ETrm5ds?R(Y|a#$?yNEcrHH)rBy^w(sx9n@acIiGW48G#$%hqe?BoM@ZC}7m=eM9^2CLy9#PF-FrwV{ z7wQ`t6oZl>h#o;T$ZXBk?eyQiaL3=hsCA^<(q1G-a1_tdQ+dv*&RpT>ACWR;E3z$s2di28Y0}?YDKj?zXF?1F(Lb63Z8Hm+yYy?Fhp2~5+qW6XCqLsk zZ8Ru0tVv<~+0QvM4^20~RrVQJl&$fWg(4c4*t@vLyJ&lsMZPqzj=gAu~A zUX36pm9VpN`5SO+@RHl~u-PiCF_*uLq@p~-&=N*|N-Q-(&dXy0!d@-k{FUWrdHgxTb@ti$8p|IyLI3R0W79EW@FA9-vdzSt|F@0MA(W55EPUx7kAU^@B|erV6JjWOOzL9kQ1wK=qgc?XC5>d)Fz{&lNY07l!F z^H0z`{?7H0U3Wh-9x zouAM=m<4q}6BbC9bjn$7YPc;Ll0Hc7kqwpvFHgimg4q<$Y|x3*kd$dCEBB_?$8UW1 z>#Jp>YhM7&qpO_Gi?<#Pa-e`2|?ZXqEb-(RW@X`)$I^M;3bGpHFJ7BtfY3p#ig2FBKh< zBR-_TvU_4CBE+?_q(+vQLH*mQb;k-UL1twZ?_?=KfUxL43>^snPY!hkFPYBpu*6N% z=udGfoy46Js%$%=a~hL3JY=6?1JAq3JStLk4fNM8Xoj;>lsk8XQ8-4msW%v!dZ_mBR&us0oBYazs1ez4#^Czp zyo}SZYf{irPa*oVEX=6ML!AdB(;1bA@xp~xpmhd6<} zwxepN;l`?g`vEB5)5C4{(`cCYGm=VKT>CZYFRx|%cTnYVEE4@KD@DaQJCW>9yQW>< zH|1cq=fCM`rv^;whFfK9{~CBLhhSmdK2zlgx_hf-r-%P6?D~C4Q-({Vf$ETN4^=5s zdVMca_zq1}93b)|`>xYhY>nLcVSB*dh|ydAY8G)cVC~Vc}Qr#yJ2)$ zb;ei_x|^&e#b+2nhm2N^q3`HP7ciMSBh9T4Ey)br>7F9BAXri_3K-dMG@0U`;`e`L zddFXGVGrDDHTHkkMMi2J%t1oA%J-uKwjNzQf5u?Rc=diJ{DSx@L}ex>Lfis~Oes8< z0v38w&%PA0Q8TL%B^u6LUF68Zp}mf zTHSV1%}nAzHG{ZE6EK-9RbFa2bJgOn~D#=JPD1y;b-%!&$ zXm8{^g-_4c-XYU7B4olTzoUoX-E|}KFx|rUJL+C-R>=9$#8AiD_o}mJR~bJ0h=6sH z!Mmg)YX931S*W=jA z=x6`Y7SsLaT=BZ>-P5jT{R}@qgR=8smm`zfpUOmqyIe0~JH0D*s@Geu0Y=W?flaVv zxVj#4P#j!85YK<4-f|mk-1x+^MCOSVv4xZhZS5s{^4W4dUEcq(>FheaXnmb$L_TD) z+miIsAGE?+J<+;h(ofn7&K8ox0}4Zo-LHt`Ip3OpEj9bRNx1n?L2$=1_vn8TilF3hUQ#@?u zuJu%-e+8gISO4r_{857PLcQ+$kLajXpgaG>V|OED=Jujs{CRi&rH9%Yyv8Qw)~&>= zD(XyS$pCDgiz*Hvu*-!1Ju5anPYd}N$$+)HlKmyQWBl~RqxkJwx1Y@XC(HS-6+Tw9 zS(8n}iC0mgq;?)fK2;@i-}ZzDUMUA7ga=?LN`TQ>vZ{wZU1PqS#{x&fFU!E~j!UYp zGTea!vIpS{^;(3FLghZox*?xqnQs5o)4JE8D%+jc`g$JS`Ho_Y6xlzhQBky5^kZ>xVdn`F zT^4kBx$Ihf9V5>axXeYuX+{rlrJt^-G_fR0HgKi5fp@T5!0hkB#4IDRhIpwXf=6o_IlVAgj z*DjXTs$eZx3Z0{gmiSF*#+)iWzZ(}$7pDIb@BtawpP3*s*38nTf2e?;LG|gd-9T}X zrI{ppd$`sjg$E>vtGrZE3K}tNsmc1H09WJEF$6FD1z>X7oX!SzsCjf$NU3Jfr&N}! zxwq=*7HABHqNE?IHE3Bi-td}Sndz2dK@sio@e0^j1s0Zav#-yJp!I6NTSnTqZ5u$a5*sRluI@#la{kWJw-i89VAEum}{}t54V3Aq%n!a|ApAp>Ye$+p<8*#aaE`$ zmPlm437idNpahDYswJ83HUunXx_~9;3RPvt_9vYa%qJ$icPC!}emk!E^T~aYW-Kbi zMOv(C(C>aOes9B+l0@wCQE`J}#>%(x64PStV$ZiNlh-uNZY7&fkp4paB#>aO!1*VW z;x|b_HzeXFHmNw@pA>|7)I^=sc7uZ^g|dy8UrFa#RuC;j4Fh+)1LDStAFv0JPQMUI z4GhIyoA^K)RK2M%C>~f@7?@Be7=kr`nmLCBWb1Ct zFde6_@mM4vE%+BHCVfIlH91d1VjKb&NLsz)`Ii3wHWm-O)+jD}(A^+4TEZ8G@*=(X z&ZV@sns#eYWFIXLUIXY5{0fHQQ7%vsP<3AM5-+TthX|P=`7-H$jiqP<3jY zc2Y&M(=)#LH-Qm*_Evpn-(EY1&X})sG+loIGPWO9DJp$BlhST+W8X3+*zFH?_gx@@ z8!rY{YiL8_kx9*3hRd$?x$-2~0g>;Iq+{3qg((sWSI84wZ&99!GA(~7uf{=K<8@Zz z(Qn6ykJA_7OsNrR5xofOJ7DXrWmS${FLZ`CpMBYMG1zG%>4B4@Q@sW!q*0Ma#H~T*Q>Z3oOBOJqzCQZ zd#))LNyYmLunwlZWJ5bCV`ntCC=T~X1m698OGW#3P-R)WUloh(g#hLj*YHAhXoxRH z{Glol14gkq6RewJrL60U3SHI@Xs4j0x)A_sW7WD-$*#gf_LST8R~VBQ>(yVczg13eY5> zsA#r5RN_5{Cfa>!Unc=_h1$^!^@2O1wx(EzNB8AL1Lps)e|bP9n-~IgmpTN{5U$@K Q{k#Lzm9>=06s$x43r#2o?*IS* literal 4585 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 T4m0=Zdj;57IGT5u`jP$zv)s{Z diff --git a/core/src/zero1hd/polyjet/Polyjet.java b/core/src/zero1hd/polyjet/Polyjet.java index 760c6fa..c8b2eb9 100755 --- a/core/src/zero1hd/polyjet/Polyjet.java +++ b/core/src/zero1hd/polyjet/Polyjet.java @@ -20,7 +20,6 @@ import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFont import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.CheckBox.CheckBoxStyle; -import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle; import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle; import com.badlogic.gdx.scenes.scene2d.ui.List.ListStyle; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane.ScrollPaneStyle; @@ -49,8 +48,7 @@ public class Polyjet extends Game { TextureAtlas skinAtlas; public Preferences prefs; - - @Override + @Override public void create() { Gdx.app.setLogLevel(Application.LOG_DEBUG); prefs = Gdx.app.getPreferences("PolyJet_Preferences"); @@ -147,7 +145,7 @@ public class Polyjet extends Game { defaultSkin.add("special-font", darktech_ldr_fontGenerator.generateFont(new FreeTypeFontParameter() { { - size = fontScale(0.08f); + size = fontScale(0.075f); } })); @@ -183,11 +181,6 @@ public class Polyjet extends Game { infoButton.down = defaultSkin.getDrawable("holo-pane-down"); defaultSkin.add("info-button", infoButton); - ButtonStyle arrowButton = new ButtonStyle(); - arrowButton.down = defaultSkin.getDrawable("goto"); - arrowButton.up = defaultSkin.getDrawable("goto"); - defaultSkin.add("arrow-button", arrowButton); - LabelStyle defaultLabel = new LabelStyle(); defaultLabel.font = defaultSkin.getFont("default-font"); defaultLabel.fontColor = defaultSkin.getColor("default"); @@ -233,7 +226,7 @@ public class Polyjet extends Game { public int fontScale(float fontSize) { - Gdx.app.debug("Font pixel size", MathUtils.round(Gdx.graphics.getDensity()*(fontSize*Gdx.graphics.getHeight())) + "px"); - return MathUtils.round(Gdx.graphics.getDensity()*(fontSize*Gdx.graphics.getHeight())); + Gdx.app.debug("Font pixel size", MathUtils.round(Gdx.graphics.getDensity()*(fontSize*Gdx.graphics.getWidth())) + "px"); + return MathUtils.round(Gdx.graphics.getDensity()*(fontSize*Gdx.graphics.getWidth())); } } diff --git a/core/src/zero1hd/polyjet/screens/PreGameScreen.java b/core/src/zero1hd/polyjet/screens/PreGameScreen.java index b6a9a18..9d25b91 100755 --- a/core/src/zero1hd/polyjet/screens/PreGameScreen.java +++ b/core/src/zero1hd/polyjet/screens/PreGameScreen.java @@ -33,20 +33,16 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { Label lastStatement; MusicSelectionPage musicSelection; + private MainMenu mainMenu; + public PreGameScreen(final Polyjet core) { this.core = core; analyzer = new AudioAnalyzer(); rhythmMap = new RhythmMap(analyzer); - stage = new Stage(); + mainMenu = (MainMenu) core.getScreen(); - stage.addListener(new ClickListener() { - @Override - public void clicked(InputEvent event, float x, float y) { - core.setScreen(new GameScreen(core)); - super.clicked(event, x, y); - } - }); + stage = new Stage(); cameraTarget = new Vector3(stage.getCamera().position); postTransition(); @@ -56,7 +52,7 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { public void postTransition() { stage.clear(); //draw music selector - musicSelection = new MusicSelectionPage(core); + musicSelection = new MusicSelectionPage(core, mainMenu); stage.addActor(musicSelection); statusText = new Label(null, core.defaultSkin); diff --git a/core/src/zero1hd/polyjet/ui/builders/GraphicsTable.java b/core/src/zero1hd/polyjet/ui/builders/GraphicsTable.java index 1c38107..ecc9c77 100755 --- a/core/src/zero1hd/polyjet/ui/builders/GraphicsTable.java +++ b/core/src/zero1hd/polyjet/ui/builders/GraphicsTable.java @@ -11,7 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.utils.Align; public class GraphicsTable extends Table { - private Label explanation; + private Label title; private SetResolutionButton _3840x2160, @@ -25,12 +25,13 @@ public class GraphicsTable extends Table { public GraphicsTable(Skin skin, final Preferences pref) { - align(Align.top); + align(Align.center); defaults().space(10f); - explanation = new Label("This game is freely resizable\n with a minimun size of\n800x480 and maximum of 3840x2160.\nThe following resolutions are the most optimal however.", skin, "small-font", skin.getColor("default")); - add(explanation); - row().space(15f); + title = new Label("Optimized Resolutions", skin); + add(title).left(); + row(); + TextButton fullscreen = new TextButton("Fullscreen", skin); fullscreen.addListener(new ChangeListener() { diff --git a/core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java b/core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java index 76b9c1f..58a9d98 100755 --- a/core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MoreOptionsPage.java @@ -3,8 +3,8 @@ package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.Actor; -import com.badlogic.gdx.scenes.scene2d.ui.Button; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import zero1hd.polyjet.Polyjet; @@ -14,26 +14,18 @@ import zero1hd.polyjet.ui.builders.SetControls; public class MoreOptionsPage extends Page { private KeyMap keymap; - private ScrollPane keyBinds; - private GraphicsTable graphicsSettings; + private ScrollPane controlsScroller; private SetControls controlSetter; + private ScrollPane graphicsScroller; + private GraphicsTable graphicsSettings; + + public MoreOptionsPage(Polyjet core, final Vector3 targetLocation) { keymap = new KeyMap(core); - controlSetter = new SetControls(core.defaultSkin, keymap); - keyBinds = new ScrollPane(controlSetter, core.defaultSkin); - keyBinds.setSize(getWidth(), getHeight()); - addActor(keyBinds); - keyBinds.setVisible(false); - - graphicsSettings = new GraphicsTable(core.defaultSkin, core.prefs); - graphicsSettings.setSize(getWidth(), getHeight()); - addActor(graphicsSettings); - graphicsSettings.setVisible(false); - - Button backArrow = new Button(core.defaultSkin, "arrow-button"); - backArrow.setPosition(30, getHeight()-backArrow.getHeight()-10); + TextButton backArrow = new TextButton("Back", core.defaultSkin); + backArrow.setPosition(15, getHeight()-backArrow.getHeight()-10); backArrow.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { @@ -41,6 +33,22 @@ public class MoreOptionsPage extends Page { } }); addActor(backArrow); + + controlSetter = new SetControls(core.defaultSkin, keymap); + controlsScroller = new ScrollPane(controlSetter, core.defaultSkin); + controlsScroller.setFadeScrollBars(false); + controlsScroller.setSize(getWidth()-backArrow.getWidth()-backArrow.getX()-10, getHeight()); + controlsScroller.setX(backArrow.getWidth()+10+backArrow.getX()); + addActor(controlsScroller); + controlsScroller.setVisible(false); + + graphicsSettings = new GraphicsTable(core.defaultSkin, core.prefs); + graphicsScroller = new ScrollPane(graphicsSettings, core.defaultSkin); + graphicsScroller.setFadeScrollBars(false); + graphicsScroller.setSize(getWidth()-backArrow.getWidth()-backArrow.getX()-10, getHeight()); + graphicsScroller.setX(backArrow.getWidth()+10+backArrow.getX()); + addActor(graphicsScroller); + graphicsScroller.setVisible(false); } public void controlUnselect() { @@ -50,12 +58,12 @@ public class MoreOptionsPage extends Page { public void setControlType(byte type) { switch (type) { case 0: - keyBinds.setVisible(true); - graphicsSettings.setVisible(false); + controlsScroller.setVisible(true); + graphicsScroller.setVisible(false); break; case 1: - keyBinds.setVisible(false); - graphicsSettings.setVisible(true); + controlsScroller.setVisible(false); + graphicsScroller.setVisible(true); break; } } diff --git a/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java b/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java index c30775b..69ab179 100755 --- a/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java @@ -1,10 +1,9 @@ package zero1hd.polyjet.ui.pages; import com.badlogic.gdx.scenes.scene2d.Actor; -import com.badlogic.gdx.scenes.scene2d.Touchable; import com.badlogic.gdx.scenes.scene2d.actions.Actions; -import com.badlogic.gdx.scenes.scene2d.ui.Button; import com.badlogic.gdx.scenes.scene2d.ui.Image; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import zero1hd.polyjet.Polyjet; @@ -12,19 +11,16 @@ import zero1hd.polyjet.screens.MainMenu; public class MusicSelectionPage extends Page { Image loading; - Button back; - public MusicSelectionPage(final Polyjet core) { + public MusicSelectionPage(final Polyjet core, final MainMenu mainMenu) { super("Select music", core.defaultSkin); - back = new Button(core.defaultSkin, "arrow-button"); - back.setPosition(15f, (getHeight()-back.getHeight())/2 -15); + TextButton back = new TextButton("Back", core.defaultSkin); + back.setPosition(getWidth()-back.getWidth()-15f, getHeight()-back.getHeight()-15f); back.addListener(new ChangeListener() { - @Override public void changed(ChangeEvent event, Actor actor) { - core.setScreen(new MainMenu(core)); - + core.setScreen(mainMenu); } }); addActor(back); diff --git a/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java index 9c8c002..5ebf132 100755 --- a/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java @@ -8,11 +8,11 @@ import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputListener; -import com.badlogic.gdx.scenes.scene2d.ui.Button; import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.ProgressBar; import com.badlogic.gdx.scenes.scene2d.ui.Slider; import com.badlogic.gdx.scenes.scene2d.ui.Table; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; @@ -27,7 +27,6 @@ public class OptionsPage extends Page { private Polyjet core; private byte goToScreen; - private Button backSymbol; public OptionsPage(final Polyjet core, final Vector3 targetPosition, final MoreOptionsPage moreOptionsPage) { this.core = core; optionsTable.defaults().padTop(5f).padBottom(5f); @@ -103,22 +102,23 @@ public class OptionsPage extends Page { //Back button - backSymbol = new Button(core.defaultSkin, "arrow-button"); - backSymbol.addListener(new ChangeListener() { + TextButton backButton = new TextButton("Back", core.defaultSkin); + backButton.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { targetPosition.x = 0.5f*Gdx.graphics.getWidth(); } }); - backSymbol.setPosition(10, (getHeight()-backSymbol.getHeight())/2); - addActor(backSymbol); + backButton.setPosition(10, getHeight()-backButton.getHeight()-18); + addActor(backButton); - optionsTable.setPosition(backSymbol.getX()+ 20 + backSymbol.getWidth(), 0); - optionsTable.setSize(getWidth()-backSymbol.getWidth()-10-20-10, getHeight()); + optionsTable.setPosition(backButton.getX()+ 20 + backButton.getWidth(), 0); + optionsTable.setSize(getWidth()-backButton.getWidth()-10-20-10, getHeight()); addActor(optionsTable); + optionsTable.row(); - Button keybindSettings = new Button(core.defaultSkin, "arrow-button"); + TextButton keybindSettings = new TextButton("Set Controls", core.defaultSkin); keybindSettings.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { @@ -126,13 +126,11 @@ public class OptionsPage extends Page { targetPosition.y = -0.5f*Gdx.graphics.getHeight(); } }); - keybindSettings.setPosition(optionsTable.getWidth()/3, optionsTable.getY()); - addActor(keybindSettings); - Label controlsSection = new Label("Controls", core.defaultSkin); - controlsSection.setPosition(keybindSettings.getX()+(keybindSettings.getWidth()-controlsSection.getWidth())/2, keybindSettings.getHeight()+keybindSettings.getY()); - addActor(controlsSection); + optionsTable.add(keybindSettings).colspan(2).fill(); - Button graphicsSettings = new Button(core.defaultSkin, "arrow-button"); + optionsTable.row(); + + TextButton graphicsSettings = new TextButton("Graphics", core.defaultSkin); graphicsSettings.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { @@ -140,11 +138,7 @@ public class OptionsPage extends Page { targetPosition.y = -0.5f*Gdx.graphics.getHeight(); } }); - graphicsSettings.setPosition(optionsTable.getWidth()*2/3, optionsTable.getY()); - addActor(graphicsSettings); - Label graphicsSection = new Label("Graphics", core.defaultSkin); - graphicsSection.setPosition(graphicsSettings.getX()+(graphicsSettings.getWidth()-graphicsSection.getWidth())/2, graphicsSettings.getHeight()+graphicsSettings.getY()); - addActor(graphicsSection); + optionsTable.add(graphicsSettings).colspan(2).fill(); } public void saveOptions(Preferences prefs) { diff --git a/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java b/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java index ef16ebd..f335f77 100755 --- a/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java +++ b/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java @@ -44,7 +44,7 @@ public class MusicSelector extends Window { TextButton confirmButton = new TextButton("confirm", skin); confirmButton.addListener(new ChangeListener() { - + @Override public void changed(ChangeEvent event, Actor actor) { confirmed = true;