LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.1: adjusted icon shading and added icons to settings menu

Browse Source
This commit is contained in:
Evan Debenham 2020-06-15 16:24:40 -04:00
parent 2b9e3a9cf4
commit 5049a9784f
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/src/main/assets/interfaces/icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
View File

@ -39,6 +39,9 @@ public enum Icons {
EXIT, EXIT,
CLOSE, CLOSE,
ARROW, ARROW,
DISPLAY,
//TODO UI,
AUDIO,
//ingame UI icons //ingame UI icons
SKULL, SKULL,
@ -118,6 +121,13 @@ public enum Icons {
case ARROW: case ARROW:
icon.frame( icon.texture.uvRect( 16, 16, 27, 27 ) ); icon.frame( icon.texture.uvRect( 16, 16, 27, 27 ) );
break; break;
case DISPLAY:
icon.frame( icon.texture.uvRect( 32, 16, 45, 32 ) );
break;
//TODO UI icon?
case AUDIO:
icon.frame( icon.texture.uvRect( 64, 16, 77, 28 ) );
break;
case SKULL: case SKULL:
icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) ); icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) );

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
View File

@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
import com.shatteredpixel.shatteredpixeldungeon.ui.CheckBox; import com.shatteredpixel.shatteredpixeldungeon.ui.CheckBox;
import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
import com.shatteredpixel.shatteredpixeldungeon.ui.OptionSlider; import com.shatteredpixel.shatteredpixeldungeon.ui.OptionSlider;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock;
@ -67,7 +68,7 @@ public class WndSettings extends WndTabbed {
audio = new AudioTab(); audio = new AudioTab();
add( audio ); add( audio );
add( new LabeledTab(Messages.get(this, "display")){ add( new IconTab(Icons.get(Icons.DISPLAY)){
@Override @Override
protected void select(boolean value) { protected void select(boolean value) {
super.select(value); super.select(value);
@ -76,7 +77,7 @@ public class WndSettings extends WndTabbed {
} }
}); });
add( new LabeledTab(Messages.get(this, "ui")){ add( new IconTab(Icons.get(Icons.PREFS)){
@Override @Override
protected void select(boolean value) { protected void select(boolean value) {
super.select(value); super.select(value);
@ -85,7 +86,7 @@ public class WndSettings extends WndTabbed {
} }
}); });
add( new LabeledTab(Messages.get(this, "audio")){ add( new IconTab(Icons.get(Icons.AUDIO)){
@Override @Override
protected void select(boolean value) { protected void select(boolean value) {
super.select(value); super.select(value);

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java
View File

@ -268,6 +268,7 @@ public class WndTabbed extends Window {
icon.y = y + CUT; icon.y = y + CUT;
} }
} }
PixelScene.align(icon);
} }
@Override @Override