From 58e41189ebf07def4a22bc1f21949cbe729473be Mon Sep 17 00:00:00 2001 From: Recrown Date: Mon, 8 May 2017 22:20:24 -0500 Subject: [PATCH] temporarily finished loading window, polished options page a little --- android/assets/uiskin.atlas | 8 +++ android/assets/uiskin.png | Bin 4330 -> 4454 bytes core/src/zero1hd/polyjet/Polyjet.java | 5 ++ .../polyjet/ui/pages/MusicSelectionPage.java | 7 ++- .../zero1hd/polyjet/ui/pages/OptionsPage.java | 12 ++-- .../polyjet/ui/windows/LoadingWindow.java | 55 +++++++++++++----- 6 files changed, 65 insertions(+), 22 deletions(-) diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index 4ca130d..4890d61 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -178,6 +178,14 @@ default-window orig: 27, 29 offset: 0, 0 index: -1 +tinted-window + rotate: false + xy: 154, 5 + size: 27, 29 + split: 4, 3, 20, 3 + orig: 27, 29 + offset: 0, 0 + index: -1 selection rotate: false xy: 174, 48 diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index 58af912ae01ff15a00d407b82762ccefccea5668..b89c81ad91e1e7a911c16aa6c8c97021a5420b05 100755 GIT binary patch literal 4454 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 SPW`n*Y)1MfdZoIqasLC>+&H}e literal 4330 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 loading.getHeight() ? status.getHeight() : loading.getHeight()); - - - add(status).expandX().right(); - + status = new Label("[ ]", skin, "sub-font", skin.getColor("default")); + add(status).spaceLeft(10f).expandX().right(); + setSize(getWidth() + status.getWidth() + 45f, (loading.getHeight() >= status.getHeight() ? loading.getHeight() : status.getHeight()) + 74); } + } + + public LoadingWindow(Skin skin, String styleName, boolean progress, AssetManager assets, float vol) { + super("loading...", skin, styleName); + + this.openSound = assets.get("sounds/SFX_open.ogg", Sound.class); + this.closeSound = assets.get("sounds/SFX_close.ogg", Sound.class); + this.vol = vol; + Image loading = new Image(skin, "loading"); + loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f))); + add(loading).left(); + System.out.println(loading.getHeight()); + + setSize(loading.getWidth()+20f, loading.getHeight()+40f); + + loading.setOrigin(loading.getWidth()/2, loading.getHeight()/2); + + + + if (progress) { + status = new Label("[ ]", skin, "sub-font", skin.getColor("default")); + add(status).spaceLeft(10f).expandX().right(); + setSize(getWidth() + status.getWidth() + 45f, (loading.getHeight() >= status.getHeight() ? loading.getHeight() : status.getHeight()) + 74); + } } public void playOpenSound() { openSound.play(vol/100f); System.out.println(vol); + } @Override