mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 00:09:23 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TechButton progress-bar padding, less rounded corners for buttons. (#8260)

Browse Source 
* Fixed TechButton progress-bar padding, less rounded corners for buttons.

* Removed extra padding on the right

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95
2022-12-29 12:52:52 +01:00
committed by GitHub
parent 8fd561de50
commit a751c8e3dc
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -38,22 +38,20 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
setAlignment(Align.right)
}
var orderIndicator: IconCircleGroup? = null
var bg = Image(BaseScreen.skinStrings.getUiBackground("TechPickerScreen/TechButton", BaseScreen.skinStrings.roundedEdgeRectangleShape))
var bg = Image(BaseScreen.skinStrings.getUiBackground("TechPickerScreen/TechButton", BaseScreen.skinStrings.roundedEdgeRectangleMidShape))
init {
touchable = Touchable.enabled
background = BaseScreen.skinStrings.getUiBackground("TechPickerScreen/TechButton", BaseScreen.skinStrings.roundedEdgeRectangleShape,
background = BaseScreen.skinStrings.getUiBackground("TechPickerScreen/TechButton", BaseScreen.skinStrings.roundedEdgeRectangleMidShape,
tintColor = Color.WHITE.darken(0.3f))
bg.toBack()
addActor(bg)
pad(0f).padBottom(5f).padTop(5f).padLeft(5f).padRight(5f)
pad(0f).padBottom(5f).padTop(5f).padLeft(5f).padRight(0f)
if (ImageGetter.techIconExists(techName))
add(ImageGetter.getTechIconGroup(techName, 45f)).padRight(5f).left()
val rightSide = Table()
add(ImageGetter.getTechIconGroup(techName, 46f)).padRight(5f).padLeft(2f).left()
if (isWorldScreen) {
val techCost = techManager.costOfTech(techName)
@ -62,14 +60,17 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
val percentComplete = (techCost - remainingTech) / techCost.toFloat()
val percentWillBeComplete = (techCost - (remainingTech-techThisTurn)) / techCost.toFloat()
val progressBar = ImageGetter.ProgressBar(2f, 50f, true)
val progressBar = ImageGetter.ProgressBar(2f, 48f, true)
.setBackground(Color.WHITE)
.setSemiProgress(Color.BLUE.brighten(0.3f), percentWillBeComplete)
.setProgress(Color.BLUE.darken(0.5f), percentComplete)
add(progressBar.addBorder(1f, Color.GRAY)).pad(10f)
add(progressBar.addBorder(1f, Color.GRAY)).padLeft(0f).padRight(5f)
}
rightSide.add(text).width(145f).top().left().padRight(15f)
rightSide.add(turns).width(40f).top().right().padRight(10f).row()
val rightSide = Table()
rightSide.add(text).width(140f).top().left().padRight(15f)
rightSide.add(turns).width(40f).top().left().padRight(10f).row()
addTechEnabledIcons(techName, isWorldScreen, rightSide)
@ -93,7 +94,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
val techEnabledIcons = Table().align(Align.left)
techEnabledIcons.background = BaseScreen.skinStrings.getUiBackground(
"TechPickerScreen/TechButtonIconsOutline",
BaseScreen.skinStrings.rectangleWithOutlineShape,
BaseScreen.skinStrings.roundedEdgeRectangleSmallShape,
tintColor = Color.BLACK.cpy().apply { a = 0.7f }
)
techEnabledIcons.pad(0f).padLeft(10f).padTop(2f).padBottom(2f)

6
docs/Modders/Creating-a-UI-skin.md
View File

@ -92,9 +92,9 @@ These shapes are used all over Unciv and can be replaced to make a lot of UI ele
| TechPickerScreen/ | Background | null | |
| TechPickerScreen/ | Background | null | |
| TechPickerScreen/ | BottomTable | null | |
| TechPickerScreen/ | TechButton | roundedEdgeRectangle | |
| TechPickerScreen/ | TechButton | roundedEdgeRectangle | |
| TechPickerScreen/ | TechButtonIconsOutline | rectangleWithOutline | |
| TechPickerScreen/ | TechButton | roundedEdgeRectangleMid | |
| TechPickerScreen/ | TechButton | roundedEdgeRectangleMid | |
| TechPickerScreen/ | TechButtonIconsOutline | roundedEdgeRectangleSmall | |
| VictoryScreen/ | CivGroup | roundedEdgeRectangle | |
| WorldScreen/ | AirUnitTable | null | |
| WorldScreen/ | BattleTable | null | |