From cc7efd0e33a38710a97ff6b867fe92a4dc747d3a Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 12 Dec 2022 16:18:45 +0900 Subject: [PATCH] renaming Toolkit.Theme colour variables --- .../terrarum/NoModuleDefaultTitlescreen.kt | 2 +- .../torvald/terrarum/TerrarumPostProcessor.kt | 2 +- .../torvald/terrarum/UIItemInventoryCatBar.kt | 2 +- .../terrarum/UIItemInventoryElemWide.kt | 8 +++---- .../terrarum/modulebasegame/TitleScreen.kt | 2 +- .../ui/UIGraphicsControlPanel.kt | 2 +- .../terrarum/modulebasegame/ui/UIIMEConfig.kt | 4 ++-- .../ui/UIItemInventoryCellBase.kt | 8 +++---- .../ui/UIItemInventoryItemGrid.kt | 6 ++--- .../ui/UIKeyboardControlPanel.kt | 4 ++-- .../modulebasegame/ui/UILoadDemoSavefiles.kt | 4 ++-- src/net/torvald/terrarum/ui/Toolkit.kt | 4 ++-- .../torvald/terrarum/ui/UIItemImageButton.kt | 4 ++-- .../terrarum/ui/UIItemInlineRadioButtons.kt | 4 ++-- src/net/torvald/terrarum/ui/UIItemList.kt | 4 ++-- src/net/torvald/terrarum/ui/UIItemSpinner.kt | 18 +++++++------- .../torvald/terrarum/ui/UIItemTextButton.kt | 4 ++-- .../terrarum/ui/UIItemTextButtonList.kt | 4 ++-- .../terrarum/ui/UIItemTextLineInput.kt | 16 ++++++------- .../torvald/terrarum/ui/UIItemTextSelector.kt | 24 +++++++++---------- 20 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/net/torvald/terrarum/NoModuleDefaultTitlescreen.kt b/src/net/torvald/terrarum/NoModuleDefaultTitlescreen.kt index 42b321daa..cbead852b 100644 --- a/src/net/torvald/terrarum/NoModuleDefaultTitlescreen.kt +++ b/src/net/torvald/terrarum/NoModuleDefaultTitlescreen.kt @@ -96,7 +96,7 @@ class NoModuleDefaultTitlescreen(batch: FlippingSpriteBatch) : IngameInstance(ba fbatch.inUse { it.color = Color.WHITE it.draw(fbo.colorBufferTexture, 0f, fbo.height.toFloat(), fbo.width.toFloat(), -fbo.height.toFloat()) - it.color = if (mouseOnLink) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE + it.color = if (mouseOnLink) Toolkit.Theme.COL_SELECTED else Toolkit.Theme.COL_MOUSE_UP App.fontGame.draw(it, pathText, pathButtonX, pathButtonY) } diff --git a/src/net/torvald/terrarum/TerrarumPostProcessor.kt b/src/net/torvald/terrarum/TerrarumPostProcessor.kt index 4c4140a25..d924afc06 100644 --- a/src/net/torvald/terrarum/TerrarumPostProcessor.kt +++ b/src/net/torvald/terrarum/TerrarumPostProcessor.kt @@ -180,7 +180,7 @@ object TerrarumPostProcessor : Disposable { "ΔF: Avr ${average.format(1)}; Med ${median.format(1)}; 5% ${low5.format(1)}; 1% ${low1.format(1)}" } } - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP batch.inUse { val tw = App.fontGame.getWidth(deltatBenchStr) App.fontGame.draw(it, deltatBenchStr, Toolkit.drawWidth - tw - 5f, App.scr.height - 24f) diff --git a/src/net/torvald/terrarum/UIItemInventoryCatBar.kt b/src/net/torvald/terrarum/UIItemInventoryCatBar.kt index 146347502..b58fe5bd8 100644 --- a/src/net/torvald/terrarum/UIItemInventoryCatBar.kt +++ b/src/net/torvald/terrarum/UIItemInventoryCatBar.kt @@ -112,7 +112,7 @@ class UIItemInventoryCatBar( initialX = iconPosX, initialY = posY + iconPosY, inactiveCol = if (index == 0 || index == 3) Color.WHITE else Color(0xffffff7f.toInt()), - activeCol = if (index == 0 || index == 3) Toolkit.Theme.COL_ACTIVE else Color(0xffffff7f.toInt()), + activeCol = if (index == 0 || index == 3) Toolkit.Theme.COL_MOUSE_UP else Color(0xffffff7f.toInt()), highlightable = (index == 0 || index == 3) ) } diff --git a/src/net/torvald/terrarum/UIItemInventoryElemWide.kt b/src/net/torvald/terrarum/UIItemInventoryElemWide.kt index 6ad4c6d67..7f1692600 100644 --- a/src/net/torvald/terrarum/UIItemInventoryElemWide.kt +++ b/src/net/torvald/terrarum/UIItemInventoryElemWide.kt @@ -68,14 +68,14 @@ class UIItemInventoryElemWide( private var highlightToMainCol = false private var highlightToSubCol = false - var cellHighlightMainCol = Toolkit.Theme.COL_HIGHLIGHT + var cellHighlightMainCol = Toolkit.Theme.COL_SELECTED var cellHighlightSubCol = Toolkit.Theme.COL_LIST_DEFAULT - var cellHighlightMouseUpCol = Toolkit.Theme.COL_ACTIVE + var cellHighlightMouseUpCol = Toolkit.Theme.COL_MOUSE_UP var cellHighlightNormalCol = Toolkit.Theme.COL_INVENTORY_CELL_BORDER - var textHighlightMainCol = Toolkit.Theme.COL_HIGHLIGHT + var textHighlightMainCol = Toolkit.Theme.COL_SELECTED var textHighlightSubCol = Color.WHITE - var textHighlightMouseUpCol = Toolkit.Theme.COL_ACTIVE + var textHighlightMouseUpCol = Toolkit.Theme.COL_MOUSE_UP var textHighlightNormalCol = Color.WHITE override fun render(batch: SpriteBatch, camera: Camera) { diff --git a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt index 9e62cee7f..5c8a61a81 100644 --- a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt +++ b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt @@ -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)) } } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt index 165651082..c9fe0a526 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt @@ -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}" diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt index fdaeb9db9..f9dfd259d 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIIMEConfig.kt @@ -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 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryCellBase.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryCellBase.kt index 474358931..c344eeb08 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryCellBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryCellBase.kt @@ -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, ) } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt index fb6622391..fe5b9d7e6 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt @@ -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 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt index 72ad6706f..d4cc865fb 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -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 diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt index 18e941ee2..366e4b9c5 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt @@ -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) { diff --git a/src/net/torvald/terrarum/ui/Toolkit.kt b/src/net/torvald/terrarum/ui/Toolkit.kt index b952432ba..07962b4ba 100644 --- a/src/net/torvald/terrarum/ui/Toolkit.kt +++ b/src/net/torvald/terrarum/ui/Toolkit.kt @@ -23,8 +23,8 @@ object Toolkit : Disposable { val COL_LIST_DEFAULT = Color.WHITE val COL_INACTIVE = Color.LIGHT_GRAY - val COL_ACTIVE = Color(0xfff066_ff.toInt()) // yellow - val COL_HIGHLIGHT = Color(0x00f8ff_ff) // cyan + val COL_SELECTED = Color(0x00f8ff_ff) // cyan, HIGHLY SATURATED + val COL_MOUSE_UP = Color(0xfff066_ff.toInt()) // yellow (all yellows are of low saturation according to the colour science) val COL_DISABLED = Color(0xaaaaaaff.toInt()) } diff --git a/src/net/torvald/terrarum/ui/UIItemImageButton.kt b/src/net/torvald/terrarum/ui/UIItemImageButton.kt index bb246b7b4..f4f12e7a1 100644 --- a/src/net/torvald/terrarum/ui/UIItemImageButton.kt +++ b/src/net/torvald/terrarum/ui/UIItemImageButton.kt @@ -15,13 +15,13 @@ open class UIItemImageButton( var image: TextureRegion, /** Colour when mouse is over */ - val activeCol: Color = Toolkit.Theme.COL_ACTIVE, + val activeCol: Color = Toolkit.Theme.COL_MOUSE_UP, /** Colour when mouse is over */ val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL, /** Colour when mouse is over */ val activeBackBlendMode: String = BlendMode.NORMAL, /** Colour when clicked/selected */ - val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, + val highlightCol: Color = Toolkit.Theme.COL_SELECTED, /** Colour when clicked/selected */ val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL, /** Colour when clicked/selected */ diff --git a/src/net/torvald/terrarum/ui/UIItemInlineRadioButtons.kt b/src/net/torvald/terrarum/ui/UIItemInlineRadioButtons.kt index 06c962b99..1a70ba7ae 100644 --- a/src/net/torvald/terrarum/ui/UIItemInlineRadioButtons.kt +++ b/src/net/torvald/terrarum/ui/UIItemInlineRadioButtons.kt @@ -79,7 +79,7 @@ class UIItemInlineRadioButtons( // mouseover borders and text if (mouseOnSelection > -1 && mouseOnSelection != selection) { val xpos = getCellX(mouseOnSelection) - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, xpos - 1, posY - 1, cellWidth + 2, height + 2) val text = labelfuns[mouseOnSelection]() val tw = App.fontGame.getWidth(text) @@ -88,7 +88,7 @@ class UIItemInlineRadioButtons( // selection borders and text val xpos = getCellX(selection) - batch.color = Toolkit.Theme.COL_HIGHLIGHT + batch.color = Toolkit.Theme.COL_SELECTED Toolkit.drawBoxBorder(batch, xpos - 1, posY - 1, cellWidth + 2, height + 2) val text = labelfuns[selection]() val tw = App.fontGame.getWidth(text) diff --git a/src/net/torvald/terrarum/ui/UIItemList.kt b/src/net/torvald/terrarum/ui/UIItemList.kt index b0b8d97aa..2dbfc6106 100644 --- a/src/net/torvald/terrarum/ui/UIItemList.kt +++ b/src/net/torvald/terrarum/ui/UIItemList.kt @@ -22,10 +22,10 @@ class UIItemList( val defaultSelection: Int? = null, // negative: INVALID, positive: valid, null: no select // copied directly from UIItemTextButton - val activeCol: Color = Toolkit.Theme.COL_ACTIVE, + val activeCol: Color = Toolkit.Theme.COL_MOUSE_UP, val activeBackCol: Color = Color(0), val activeBackBlendMode: String = BlendMode.NORMAL, - val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, + val highlightCol: Color = Toolkit.Theme.COL_SELECTED, val highlightBackCol: Color = Color(0xb0b0b0_ff.toInt()), val highlightBackBlendMode: String = BlendMode.MULTIPLY, val inactiveCol: Color = Toolkit.Theme.COL_INACTIVE, diff --git a/src/net/torvald/terrarum/ui/UIItemSpinner.kt b/src/net/torvald/terrarum/ui/UIItemSpinner.kt index 806a2206c..3f54d2f2e 100644 --- a/src/net/torvald/terrarum/ui/UIItemSpinner.kt +++ b/src/net/torvald/terrarum/ui/UIItemSpinner.kt @@ -125,30 +125,30 @@ class UIItemSpinner( } // left button border - batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE + batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 1) Toolkit.Theme.COL_MOUSE_UP else Toolkit.Theme.COL_INACTIVE Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, buttonW + 2, height + 2) // right button border - batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE + batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 2) Toolkit.Theme.COL_MOUSE_UP else Toolkit.Theme.COL_INACTIVE Toolkit.drawBoxBorder(batch, posX + width - buttonW - 1, posY - 1, buttonW + 2, height + 2) // text area border (again) if (mouseOnButton == 3) { - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2) } } // left button icon - batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT + batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 1) Toolkit.Theme.COL_MOUSE_UP else UIItemTextLineInput.TEXTINPUT_COL_TEXT batch.draw(labels.get(9,2), posX + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f) // right button icon - batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT + batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 2) Toolkit.Theme.COL_MOUSE_UP else UIItemTextLineInput.TEXTINPUT_COL_TEXT batch.draw(labels.get(10,2), posX + width - buttonW + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f) // draw text diff --git a/src/net/torvald/terrarum/ui/UIItemTextButton.kt b/src/net/torvald/terrarum/ui/UIItemTextButton.kt index bd4b80f14..4b7a90c3b 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextButton.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextButton.kt @@ -23,13 +23,13 @@ open class UIItemTextButton( val readFromLang: Boolean = false, /** Colour when mouse is over */ - val activeCol: Color = Toolkit.Theme.COL_ACTIVE, + val activeCol: Color = Toolkit.Theme.COL_MOUSE_UP, /** Colour when mouse is over */ val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL, /** Colour when mouse is over */ val activeBackBlendMode: String = BlendMode.NORMAL, /** Colour when clicked/selected */ - val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, + val highlightCol: Color = Toolkit.Theme.COL_SELECTED, /** Colour when clicked/selected */ val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL, /** Colour when clicked/selected */ diff --git a/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt b/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt index 7f8c619d7..b8628328f 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextButtonList.kt @@ -31,13 +31,13 @@ class UIItemTextButtonList( // copied directly from UIItemTextButton /** Colour when mouse is over */ - val activeCol: Color = Toolkit.Theme.COL_ACTIVE, + val activeCol: Color = Toolkit.Theme.COL_MOUSE_UP, /** Colour when mouse is over */ val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL, /** Colour when mouse is over */ val activeBackBlendMode: String = BlendMode.NORMAL, /** Colour when clicked/selected */ - val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, + val highlightCol: Color = Toolkit.Theme.COL_SELECTED, /** Colour when clicked/selected */ val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL, /** Colour when clicked/selected */ diff --git a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt index 75f3a59a9..0543a1a34 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt @@ -519,21 +519,21 @@ class UIItemTextLineInput( // text area border (pop-up for isActive) if (isActive) { - batch.color = Toolkit.Theme.COL_HIGHLIGHT + batch.color = Toolkit.Theme.COL_SELECTED Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2) // this is a full border, not a text area } // button border if (mouseUpOnPasteButton) { - batch.color = if (mouseDown) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE + batch.color = if (mouseDown) Toolkit.Theme.COL_SELECTED else Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, btn2PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2) } else if (mouseUpOnIMEButton) { - batch.color = if (mouseDown) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE + batch.color = if (mouseDown) Toolkit.Theme.COL_SELECTED else Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, btn1PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2) } else if (mouseUpOnTextArea && !isActive) { - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, inputPosX - 1, posY - 1, fbo.width + 2 * UI_TEXT_MARGIN+ 2, height + 2) } @@ -558,10 +558,10 @@ class UIItemTextLineInput( // draw icon // IME button - batch.color = if (mouseUpOnIMEButton && mouseDown || imeOn) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnIMEButton) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE + batch.color = if (mouseUpOnIMEButton && mouseDown || imeOn) Toolkit.Theme.COL_MOUSE_UP else if (mouseUpOnIMEButton) Toolkit.Theme.COL_SELECTED else Toolkit.Theme.COL_INACTIVE batch.draw(imeButton, btn1PosX + 2f, posY + 2f) // paste button - batch.color = if (mouseUpOnPasteButton && mouseDown) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnPasteButton) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE + batch.color = if (mouseUpOnPasteButton && mouseDown) Toolkit.Theme.COL_MOUSE_UP else if (mouseUpOnPasteButton) Toolkit.Theme.COL_SELECTED else Toolkit.Theme.COL_INACTIVE batch.draw(labels.get(8,2), btn2PosX + 2f, posY + 2f) // state of the candidates are concurrently changing, so we buffer them @@ -588,7 +588,7 @@ class UIItemTextLineInput( batch.color = candidatesBackCol Toolkit.fillArea(batch, candidatePosX, candidatePosY, candidateWinW + 4, candidateWinH) // candidate view border - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, candidatePosX - 1, candidatePosY - 1, candidateWinW + 6, candidateWinH + 2) // candidate texts @@ -613,7 +613,7 @@ class UIItemTextLineInput( batch.color = candidatesBackCol Toolkit.fillArea(batch, candidatePosX, candidatePosY, candidateWinW, candidateWinH) // candidate view border - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, candidatePosX - 1, candidatePosY - 1, candidateWinW + 2, candidateWinH + 2) val previewTextWidth = textWidths[0] diff --git a/src/net/torvald/terrarum/ui/UIItemTextSelector.kt b/src/net/torvald/terrarum/ui/UIItemTextSelector.kt index 5d702361d..8dc6cab61 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextSelector.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextSelector.kt @@ -156,30 +156,30 @@ class UIItemTextSelector( } // left button border - batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE + batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 1) Toolkit.Theme.COL_MOUSE_UP else Toolkit.Theme.COL_INACTIVE Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, buttonW + 2, height + 2) // right button border - batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE + batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 2) Toolkit.Theme.COL_MOUSE_UP else Toolkit.Theme.COL_INACTIVE Toolkit.drawBoxBorder(batch, posX + width - buttonW - 1, posY - 1, buttonW + 2, height + 2) // text area border (again) if (!paletteShowing && mouseOnButton == 3) { - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2) } } // left button icon - batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT + batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 1) Toolkit.Theme.COL_MOUSE_UP else UIItemTextLineInput.TEXTINPUT_COL_TEXT batch.draw(labels.get(16,0), posX + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f) // right button icon - batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT - else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT + batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED + else if (mouseOnButton == 2) Toolkit.Theme.COL_MOUSE_UP else UIItemTextLineInput.TEXTINPUT_COL_TEXT batch.draw(labels.get(17,0), posX + width - buttonW + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f) // draw text @@ -202,13 +202,13 @@ class UIItemTextSelector( batch.color = palCursorCol Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2) // palette border - batch.color = Toolkit.Theme.COL_ACTIVE + batch.color = Toolkit.Theme.COL_MOUSE_UP Toolkit.drawBoxBorder(batch, palX-1, palY-1, palW+2, palH+2) // palette items labelCache.forEachIndexed { index, s -> - batch.color = if (index == selection) Toolkit.Theme.COL_HIGHLIGHT - else if (index == mouseOnPaletteItem) Toolkit.Theme.COL_ACTIVE + batch.color = if (index == selection) Toolkit.Theme.COL_SELECTED + else if (index == mouseOnPaletteItem) Toolkit.Theme.COL_MOUSE_UP else UIItemTextLineInput.TEXTINPUT_COL_TEXT val t = labelCache[index] val tw = App.fontGame.getWidth(t)