curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 18:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

renaming Toolkit.Theme colour variables

Browse Source
This commit is contained in:
minjaesong
2022-12-12 16:18:45 +09:00
parent 9c84e8f597
commit cc7efd0e33
20 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
View File

@@ -361,7 +361,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
Toolkit.drawCentered(batch, warning32bitJavaIcon, yoff)
for (i in 0..2) {
val text = Lang.get("GAME_32BIT_WARNING${i+1}", (i != 2))
if (i == 2) batch.color = Toolkit.Theme.COL_HIGHLIGHT
if (i == 2) batch.color = Toolkit.Theme.COL_SELECTED
App.fontGame.draw(batch, text, ((drawWidth - App.fontGame.getWidth(text)) / 2).toFloat(), yoff + imgTxtGap + 64f + linegap + i*(20+linegap))
}
}

2
src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt
View File

@@ -129,7 +129,7 @@ class UIGraphicsControlPanel(remoCon: UIRemoCon?) : UICanvas() {
batch.color = Color(0x00f8ff_40)
Toolkit.fillArea(batch, xstart + 1, 1, App.scr.chatWidth - 2, App.scr.height - 2)
batch.color = Toolkit.Theme.COL_ACTIVE
batch.color = Toolkit.Theme.COL_MOUSE_UP
Toolkit.drawBoxBorder(batch, xstart + 1, 1, App.scr.chatWidth - 2, App.scr.height - 2)
val overlayResTxt = "${(App.scr.chatWidth * App.scr.magn).ceilInt()}$TIMES${App.scr.windowH}"

4
src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt
View File

@@ -251,8 +251,8 @@ private class UIItemInputKeycap(
private val borderKeyForbidden = Color(0x000000C0)
private val borderKeyNormal = Toolkit.Theme.COL_INACTIVE
private val borderMouseUp = Toolkit.Theme.COL_ACTIVE
private val borderKeyPressed = Toolkit.Theme.COL_HIGHLIGHT
private val borderMouseUp = Toolkit.Theme.COL_MOUSE_UP
private val borderKeyPressed = Toolkit.Theme.COL_SELECTED
private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt())
private val keycapFill = Toolkit.Theme.COL_CELL_FILL

8
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryCellBase.kt
View File

@@ -96,13 +96,13 @@ object UIItemInventoryCellCommonRes {
}
val defaultInventoryCellTheme = InventoryCellColourTheme(
Toolkit.Theme.COL_HIGHLIGHT,
Toolkit.Theme.COL_SELECTED,
Toolkit.Theme.COL_LIST_DEFAULT,
Toolkit.Theme.COL_ACTIVE,
Toolkit.Theme.COL_MOUSE_UP,
Toolkit.Theme.COL_INVENTORY_CELL_BORDER,
Toolkit.Theme.COL_HIGHLIGHT,
Toolkit.Theme.COL_SELECTED,
Color.WHITE,
Toolkit.Theme.COL_ACTIVE,
Toolkit.Theme.COL_MOUSE_UP,
Color.WHITE,
)
}

6
src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt
View File

@@ -239,7 +239,7 @@ open class UIItemInventoryItemGrid(
activeBackCol = Color(0),
highlightBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL,
activeCol = Toolkit.Theme.COL_ACTIVE,
activeCol = Toolkit.Theme.COL_MOUSE_UP,
initialX = iconPosX,
initialY = getIconPosY(index),
highlightable = true
@@ -252,7 +252,7 @@ open class UIItemInventoryItemGrid(
backgroundCol = Color(0),
activeBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL,
activeCol = Toolkit.Theme.COL_ACTIVE,
activeCol = Toolkit.Theme.COL_MOUSE_UP,
initialX = iconPosX,
initialY = getIconPosY(2),
highlightable = false
@@ -264,7 +264,7 @@ open class UIItemInventoryItemGrid(
backgroundCol = Color(0),
activeBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL,
activeCol = Toolkit.Theme.COL_ACTIVE,
activeCol = Toolkit.Theme.COL_MOUSE_UP,
initialX = iconPosX,
initialY = getIconPosY(3),
highlightable = false

4
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -286,8 +286,8 @@ private class UIItemKeycap(
private val borderKeyForbidden = Color(0x000000C0)
private val borderKeyNormal = Toolkit.Theme.COL_INACTIVE
private val borderMouseUp = Toolkit.Theme.COL_ACTIVE
private val borderKeyPressed = Toolkit.Theme.COL_HIGHLIGHT
private val borderMouseUp = Toolkit.Theme.COL_MOUSE_UP
private val borderKeyPressed = Toolkit.Theme.COL_SELECTED
private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt())
private val keycapFill = Toolkit.Theme.COL_CELL_FILL

4
src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
View File

@@ -539,7 +539,7 @@ class UIItemPlayerCells(
internal var hasTexture = false
private set
private val litCol = Toolkit.Theme.COL_ACTIVE
private val litCol = Toolkit.Theme.COL_MOUSE_UP
private val cellCol = CELL_COL
private val defaultCol = Color.WHITE
private val hruleCol = Color(1f,1f,1f,0.35f)
@@ -755,7 +755,7 @@ class UIItemWorldCells(
override fun update(delta: Float) {
super.update(delta)
highlightCol = if (mouseUp) Toolkit.Theme.COL_ACTIVE else Color.WHITE
highlightCol = if (mouseUp) Toolkit.Theme.COL_MOUSE_UP else Color.WHITE
}
override fun render(batch: SpriteBatch, camera: Camera) {