wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add close icon for the UnitTable (#1472)

Browse source
This commit is contained in:
Kevin Fisher 2019-12-17 11:44:20 -08:00 committed by Yair Morgenstern
parent a90d93c27e
commit 52111430ef
5 changed files with 616 additions and 609 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/OtherIcons/Close.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.3 KiB

1223
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 877 KiB

After

Width:  |  Height:  |  Size: 877 KiB

BIN
android/assets/game2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 286 KiB

After

Width:  |  Height:  |  Size: 288 KiB

2
core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
View file

@ -43,7 +43,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
add(VerticalGroup().apply {
pad(5f)
deselectUnitButton.add(Label("X",CameraStageBaseScreen.skin)).pad(10f)
deselectUnitButton.add(ImageGetter.getImage("OtherIcons/Close")).size(20f).pad(10f)
deselectUnitButton.pack()
deselectUnitButton.touchable = Touchable.enabled
deselectUnitButton.onClick { selectedUnit=null; selectedCity=null; worldScreen.shouldUpdate=true;this@UnitTable.isVisible=false }