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

key setup ui bug fix

Browse Source
This commit is contained in:
minjaesong
2021-09-20 00:51:17 +09:00
parent e13f1fe7b6
commit 4784956627
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/gui/inventory/category.tga LFS
View File

Binary file not shown.

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

@@ -321,6 +321,10 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
UIItemImageButton(parent, icons.get(6,2), initialX = initialX + (width / 2) + 20, initialY = initialY + 140, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)), UIItemImageButton(parent, icons.get(6,2), initialX = initialX + (width / 2) + 20, initialY = initialY + 140, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0)),
) )
// close button is just for the cosmetics; the uiitem closes when you click anywhere on the UI
private val closeButton =
UIItemImageButton(parent, icons.get(22,0), initialX = initialX + width - 20, initialY = initialY, highlightable = false, backgroundCol = Color(0), activeBackCol = Color(0), highlightBackCol = Color(0))
companion object { companion object {
val indexToConfigKey = hashMapOf( val indexToConfigKey = hashMapOf(
0 to "control_key_left", 0 to "control_key_left",
@@ -347,9 +351,11 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
Toolkit.drawBoxBorder(batch, it.posX-4, it.posY-4, 28, 28) Toolkit.drawBoxBorder(batch, it.posX-4, it.posY-4, 28, 28)
} }
closeButton.render(batch, camera)
// texts // texts
batch.color = Color.WHITE batch.color = Color.WHITE
App.fontGame.draw(batch, Lang["GAME_ACTION_MOVE_VERB"], posX + 258f, posY + 40f) App.fontGame.draw(batch, Lang["GAME_ACTION_MOVE_VERB"], posX + 262f, posY + 40f)
App.fontGame.draw(batch, Lang["GAME_ACTION_JUMP"], posX + 90f, posY + 100f) App.fontGame.draw(batch, Lang["GAME_ACTION_JUMP"], posX + 90f, posY + 100f)
App.fontGame.draw(batch, Lang["GAME_INVENTORY"], posX + 90f, posY + 140f) App.fontGame.draw(batch, Lang["GAME_INVENTORY"], posX + 90f, posY + 140f)
@@ -358,10 +364,10 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
App.fontGame.draw(batch, Lang["MENU_LABEL_MENU"], posX + (width / 2) + 60f, posY + 140f) App.fontGame.draw(batch, Lang["MENU_LABEL_MENU"], posX + (width / 2) + 60f, posY + 140f)
} }
private var selected = -1
override fun update(delta: Float) { override fun update(delta: Float) {
super.update(delta) // unlatches mouse super.update(delta) // unlatches mouse
var selected = -1
iconButtons.forEachIndexed { index, it -> iconButtons.forEachIndexed { index, it ->
it.update(delta) it.update(delta)
@@ -370,6 +376,8 @@ class UIItemControlPaletteBaloon(val parent: UIKeyboardControlPanel, initialX: I
} }
} }
closeButton.update(delta)
// close // close
if (!mouseLatched && mousePushed) { if (!mouseLatched && mousePushed) {
mouseLatched = true mouseLatched = true