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

separated whiteDot for images from TableBackground for backgrounds

Browse source
This commit is contained in:
Yair Morgenstern 2019-11-08 15:42:19 +02:00
parent 4d5ae8fa25
commit e1350cdb05
7 changed files with 576 additions and 574 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 187 B

BIN
android/Images/OtherIcons/tileTableBackground.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
android/Images/OtherIcons/whiteDot.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 131 B

After

Width:  |  Height:  |  Size: 119 B

1142
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: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

5
core/src/com/unciv/ui/utils/ImageGetter.kt
View file

@ -167,7 +167,10 @@ object ImageGetter {
fun getCircle() = getImage("OtherIcons/Circle")
fun getBackground(color:Color): Drawable {
return getDrawable(whiteDotLocation).tint(color)
val drawable = getDrawable("OtherIcons/TableBackground")
drawable.minHeight=0f
drawable.minWidth=0f
return drawable.tint(color)
}

3
core/src/com/unciv/ui/worldscreen/optionstable/PopupTable.kt
View file

@ -12,8 +12,7 @@ import com.unciv.ui.utils.*
open class PopupTable(val screen: CameraStageBaseScreen): Table(CameraStageBaseScreen.skin) {
init {
val tileTableBackground = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK, 0.5f))
background = tileTableBackground
background = ImageGetter.getBackground(ImageGetter.getBlue().lerp(Color.BLACK, 0.5f))
this.pad(20f)
this.defaults().pad(5f)