curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-15 16:16:10 +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/NoModuleDefaultTitlescreen.kt
View File

@@ -96,7 +96,7 @@ class NoModuleDefaultTitlescreen(batch: FlippingSpriteBatch) : IngameInstance(ba
fbatch.inUse { fbatch.inUse {
it.color = Color.WHITE it.color = Color.WHITE
it.draw(fbo.colorBufferTexture, 0f, fbo.height.toFloat(), fbo.width.toFloat(), -fbo.height.toFloat()) 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) App.fontGame.draw(it, pathText, pathButtonX, pathButtonY)
} }

2
src/net/torvald/terrarum/TerrarumPostProcessor.kt
View File

@@ -180,7 +180,7 @@ object TerrarumPostProcessor : Disposable {
"ΔF: Avr ${average.format(1)}; Med ${median.format(1)}; 5% ${low5.format(1)}; 1% ${low1.format(1)}" "Δ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 { batch.inUse {
val tw = App.fontGame.getWidth(deltatBenchStr) val tw = App.fontGame.getWidth(deltatBenchStr)
App.fontGame.draw(it, deltatBenchStr, Toolkit.drawWidth - tw - 5f, App.scr.height - 24f) App.fontGame.draw(it, deltatBenchStr, Toolkit.drawWidth - tw - 5f, App.scr.height - 24f)

2
src/net/torvald/terrarum/UIItemInventoryCatBar.kt
View File

@@ -112,7 +112,7 @@ class UIItemInventoryCatBar(
initialX = iconPosX, initialX = iconPosX,
initialY = posY + iconPosY, initialY = posY + iconPosY,
inactiveCol = if (index == 0 || index == 3) Color.WHITE else Color(0xffffff7f.toInt()), 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) highlightable = (index == 0 || index == 3)
) )
} }

8
src/net/torvald/terrarum/UIItemInventoryElemWide.kt
View File

@@ -68,14 +68,14 @@ class UIItemInventoryElemWide(
private var highlightToMainCol = false private var highlightToMainCol = false
private var highlightToSubCol = 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 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 cellHighlightNormalCol = Toolkit.Theme.COL_INVENTORY_CELL_BORDER
var textHighlightMainCol = Toolkit.Theme.COL_HIGHLIGHT var textHighlightMainCol = Toolkit.Theme.COL_SELECTED
var textHighlightSubCol = Color.WHITE var textHighlightSubCol = Color.WHITE
var textHighlightMouseUpCol = Toolkit.Theme.COL_ACTIVE var textHighlightMouseUpCol = Toolkit.Theme.COL_MOUSE_UP
var textHighlightNormalCol = Color.WHITE var textHighlightNormalCol = Color.WHITE
override fun render(batch: SpriteBatch, camera: Camera) { override fun render(batch: SpriteBatch, camera: Camera) {

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) Toolkit.drawCentered(batch, warning32bitJavaIcon, yoff)
for (i in 0..2) { for (i in 0..2) {
val text = Lang.get("GAME_32BIT_WARNING${i+1}", (i != 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)) 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) batch.color = Color(0x00f8ff_40)
Toolkit.fillArea(batch, xstart + 1, 1, App.scr.chatWidth - 2, App.scr.height - 2) 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) 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}" 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 borderKeyForbidden = Color(0x000000C0)
private val borderKeyNormal = Toolkit.Theme.COL_INACTIVE private val borderKeyNormal = Toolkit.Theme.COL_INACTIVE
private val borderMouseUp = Toolkit.Theme.COL_ACTIVE private val borderMouseUp = Toolkit.Theme.COL_MOUSE_UP
private val borderKeyPressed = Toolkit.Theme.COL_HIGHLIGHT private val borderKeyPressed = Toolkit.Theme.COL_SELECTED
private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt()) private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt())
private val keycapFill = Toolkit.Theme.COL_CELL_FILL 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( val defaultInventoryCellTheme = InventoryCellColourTheme(
Toolkit.Theme.COL_HIGHLIGHT, Toolkit.Theme.COL_SELECTED,
Toolkit.Theme.COL_LIST_DEFAULT, Toolkit.Theme.COL_LIST_DEFAULT,
Toolkit.Theme.COL_ACTIVE, Toolkit.Theme.COL_MOUSE_UP,
Toolkit.Theme.COL_INVENTORY_CELL_BORDER, Toolkit.Theme.COL_INVENTORY_CELL_BORDER,
Toolkit.Theme.COL_HIGHLIGHT, Toolkit.Theme.COL_SELECTED,
Color.WHITE, Color.WHITE,
Toolkit.Theme.COL_ACTIVE, Toolkit.Theme.COL_MOUSE_UP,
Color.WHITE, Color.WHITE,
) )
} }

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

@@ -239,7 +239,7 @@ open class UIItemInventoryItemGrid(
activeBackCol = Color(0), activeBackCol = Color(0),
highlightBackCol = Color(0), highlightBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL, activeBackBlendMode = BlendMode.NORMAL,
activeCol = Toolkit.Theme.COL_ACTIVE, activeCol = Toolkit.Theme.COL_MOUSE_UP,
initialX = iconPosX, initialX = iconPosX,
initialY = getIconPosY(index), initialY = getIconPosY(index),
highlightable = true highlightable = true
@@ -252,7 +252,7 @@ open class UIItemInventoryItemGrid(
backgroundCol = Color(0), backgroundCol = Color(0),
activeBackCol = Color(0), activeBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL, activeBackBlendMode = BlendMode.NORMAL,
activeCol = Toolkit.Theme.COL_ACTIVE, activeCol = Toolkit.Theme.COL_MOUSE_UP,
initialX = iconPosX, initialX = iconPosX,
initialY = getIconPosY(2), initialY = getIconPosY(2),
highlightable = false highlightable = false
@@ -264,7 +264,7 @@ open class UIItemInventoryItemGrid(
backgroundCol = Color(0), backgroundCol = Color(0),
activeBackCol = Color(0), activeBackCol = Color(0),
activeBackBlendMode = BlendMode.NORMAL, activeBackBlendMode = BlendMode.NORMAL,
activeCol = Toolkit.Theme.COL_ACTIVE, activeCol = Toolkit.Theme.COL_MOUSE_UP,
initialX = iconPosX, initialX = iconPosX,
initialY = getIconPosY(3), initialY = getIconPosY(3),
highlightable = false 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 borderKeyForbidden = Color(0x000000C0)
private val borderKeyNormal = Toolkit.Theme.COL_INACTIVE private val borderKeyNormal = Toolkit.Theme.COL_INACTIVE
private val borderMouseUp = Toolkit.Theme.COL_ACTIVE private val borderMouseUp = Toolkit.Theme.COL_MOUSE_UP
private val borderKeyPressed = Toolkit.Theme.COL_HIGHLIGHT private val borderKeyPressed = Toolkit.Theme.COL_SELECTED
private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt()) private val borderKeyPressedAndSelected = Color(0x33FF33FF.toInt())
private val keycapFill = Toolkit.Theme.COL_CELL_FILL 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 internal var hasTexture = false
private set private set
private val litCol = Toolkit.Theme.COL_ACTIVE private val litCol = Toolkit.Theme.COL_MOUSE_UP
private val cellCol = CELL_COL private val cellCol = CELL_COL
private val defaultCol = Color.WHITE private val defaultCol = Color.WHITE
private val hruleCol = Color(1f,1f,1f,0.35f) private val hruleCol = Color(1f,1f,1f,0.35f)
@@ -755,7 +755,7 @@ class UIItemWorldCells(
override fun update(delta: Float) { override fun update(delta: Float) {
super.update(delta) 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) { override fun render(batch: SpriteBatch, camera: Camera) {

4
src/net/torvald/terrarum/ui/Toolkit.kt
View File

@@ -23,8 +23,8 @@ object Toolkit : Disposable {
val COL_LIST_DEFAULT = Color.WHITE val COL_LIST_DEFAULT = Color.WHITE
val COL_INACTIVE = Color.LIGHT_GRAY val COL_INACTIVE = Color.LIGHT_GRAY
val COL_ACTIVE = Color(0xfff066_ff.toInt()) // yellow val COL_SELECTED = Color(0x00f8ff_ff) // cyan, HIGHLY SATURATED
val COL_HIGHLIGHT = Color(0x00f8ff_ff) // cyan 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()) val COL_DISABLED = Color(0xaaaaaaff.toInt())
} }

4
src/net/torvald/terrarum/ui/UIItemImageButton.kt
View File

@@ -15,13 +15,13 @@ open class UIItemImageButton(
var image: TextureRegion, var image: TextureRegion,
/** Colour when mouse is over */ /** 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 */ /** Colour when mouse is over */
val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL, val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL,
/** Colour when mouse is over */ /** Colour when mouse is over */
val activeBackBlendMode: String = BlendMode.NORMAL, val activeBackBlendMode: String = BlendMode.NORMAL,
/** Colour when clicked/selected */ /** Colour when clicked/selected */
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, val highlightCol: Color = Toolkit.Theme.COL_SELECTED,
/** Colour when clicked/selected */ /** Colour when clicked/selected */
val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL, val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL,
/** Colour when clicked/selected */ /** Colour when clicked/selected */

4
src/net/torvald/terrarum/ui/UIItemInlineRadioButtons.kt
View File

@@ -79,7 +79,7 @@ class UIItemInlineRadioButtons(
// mouseover borders and text // mouseover borders and text
if (mouseOnSelection > -1 && mouseOnSelection != selection) { if (mouseOnSelection > -1 && mouseOnSelection != selection) {
val xpos = getCellX(mouseOnSelection) 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) Toolkit.drawBoxBorder(batch, xpos - 1, posY - 1, cellWidth + 2, height + 2)
val text = labelfuns[mouseOnSelection]() val text = labelfuns[mouseOnSelection]()
val tw = App.fontGame.getWidth(text) val tw = App.fontGame.getWidth(text)
@@ -88,7 +88,7 @@ class UIItemInlineRadioButtons(
// selection borders and text // selection borders and text
val xpos = getCellX(selection) 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) Toolkit.drawBoxBorder(batch, xpos - 1, posY - 1, cellWidth + 2, height + 2)
val text = labelfuns[selection]() val text = labelfuns[selection]()
val tw = App.fontGame.getWidth(text) val tw = App.fontGame.getWidth(text)

4
src/net/torvald/terrarum/ui/UIItemList.kt
View File

@@ -22,10 +22,10 @@ class UIItemList<Item: UIItem>(
val defaultSelection: Int? = null, // negative: INVALID, positive: valid, null: no select val defaultSelection: Int? = null, // negative: INVALID, positive: valid, null: no select
// copied directly from UIItemTextButton // 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 activeBackCol: Color = Color(0),
val activeBackBlendMode: String = BlendMode.NORMAL, 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 highlightBackCol: Color = Color(0xb0b0b0_ff.toInt()),
val highlightBackBlendMode: String = BlendMode.MULTIPLY, val highlightBackBlendMode: String = BlendMode.MULTIPLY,
val inactiveCol: Color = Toolkit.Theme.COL_INACTIVE, val inactiveCol: Color = Toolkit.Theme.COL_INACTIVE,

18
src/net/torvald/terrarum/ui/UIItemSpinner.kt
View File

@@ -125,30 +125,30 @@ class UIItemSpinner(
} }
// left button border // left button border
batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE 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) Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, buttonW + 2, height + 2)
// right button border // right button border
batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE 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) Toolkit.drawBoxBorder(batch, posX + width - buttonW - 1, posY - 1, buttonW + 2, height + 2)
// text area border (again) // text area border (again)
if (mouseOnButton == 3) { 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) Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2)
} }
} }
// left button icon // left button icon
batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT 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) batch.draw(labels.get(9,2), posX + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f)
// right button icon // right button icon
batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT 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) batch.draw(labels.get(10,2), posX + width - buttonW + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f)
// draw text // draw text

4
src/net/torvald/terrarum/ui/UIItemTextButton.kt
View File

@@ -23,13 +23,13 @@ open class UIItemTextButton(
val readFromLang: Boolean = false, val readFromLang: Boolean = false,
/** Colour when mouse is over */ /** 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 */ /** Colour when mouse is over */
val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL, val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL,
/** Colour when mouse is over */ /** Colour when mouse is over */
val activeBackBlendMode: String = BlendMode.NORMAL, val activeBackBlendMode: String = BlendMode.NORMAL,
/** Colour when clicked/selected */ /** Colour when clicked/selected */
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, val highlightCol: Color = Toolkit.Theme.COL_SELECTED,
/** Colour when clicked/selected */ /** Colour when clicked/selected */
val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL, val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL,
/** Colour when clicked/selected */ /** Colour when clicked/selected */

4
src/net/torvald/terrarum/ui/UIItemTextButtonList.kt
View File

@@ -31,13 +31,13 @@ class UIItemTextButtonList(
// copied directly from UIItemTextButton // copied directly from UIItemTextButton
/** Colour when mouse is over */ /** 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 */ /** Colour when mouse is over */
val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL, val activeBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_ACTIVECOL,
/** Colour when mouse is over */ /** Colour when mouse is over */
val activeBackBlendMode: String = BlendMode.NORMAL, val activeBackBlendMode: String = BlendMode.NORMAL,
/** Colour when clicked/selected */ /** Colour when clicked/selected */
val highlightCol: Color = Toolkit.Theme.COL_HIGHLIGHT, val highlightCol: Color = Toolkit.Theme.COL_SELECTED,
/** Colour when clicked/selected */ /** Colour when clicked/selected */
val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL, val highlightBackCol: Color = UIItemTextButtonList.DEFAULT_BACKGROUND_HIGHLIGHTCOL,
/** Colour when clicked/selected */ /** Colour when clicked/selected */

16
src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
View File

@@ -519,21 +519,21 @@ class UIItemTextLineInput(
// text area border (pop-up for isActive) // text area border (pop-up for isActive)
if (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 Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2) // this is a full border, not a text area
} }
// button border // button border
if (mouseUpOnPasteButton) { 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) Toolkit.drawBoxBorder(batch, btn2PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
} }
else if (mouseUpOnIMEButton) { 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) Toolkit.drawBoxBorder(batch, btn1PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
} }
else if (mouseUpOnTextArea && !isActive) { 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) Toolkit.drawBoxBorder(batch, inputPosX - 1, posY - 1, fbo.width + 2 * UI_TEXT_MARGIN+ 2, height + 2)
} }
@@ -558,10 +558,10 @@ class UIItemTextLineInput(
// draw icon // draw icon
// IME button // 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) batch.draw(imeButton, btn1PosX + 2f, posY + 2f)
// paste button // 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) batch.draw(labels.get(8,2), btn2PosX + 2f, posY + 2f)
// state of the candidates are concurrently changing, so we buffer them // state of the candidates are concurrently changing, so we buffer them
@@ -588,7 +588,7 @@ class UIItemTextLineInput(
batch.color = candidatesBackCol batch.color = candidatesBackCol
Toolkit.fillArea(batch, candidatePosX, candidatePosY, candidateWinW + 4, candidateWinH) Toolkit.fillArea(batch, candidatePosX, candidatePosY, candidateWinW + 4, candidateWinH)
// candidate view border // 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) Toolkit.drawBoxBorder(batch, candidatePosX - 1, candidatePosY - 1, candidateWinW + 6, candidateWinH + 2)
// candidate texts // candidate texts
@@ -613,7 +613,7 @@ class UIItemTextLineInput(
batch.color = candidatesBackCol batch.color = candidatesBackCol
Toolkit.fillArea(batch, candidatePosX, candidatePosY, candidateWinW, candidateWinH) Toolkit.fillArea(batch, candidatePosX, candidatePosY, candidateWinW, candidateWinH)
// candidate view border // 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) Toolkit.drawBoxBorder(batch, candidatePosX - 1, candidatePosY - 1, candidateWinW + 2, candidateWinH + 2)
val previewTextWidth = textWidths[0] val previewTextWidth = textWidths[0]

24
src/net/torvald/terrarum/ui/UIItemTextSelector.kt
View File

@@ -156,30 +156,30 @@ class UIItemTextSelector(
} }
// left button border // left button border
batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE 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) Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, buttonW + 2, height + 2)
// right button border // right button border
batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE 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) Toolkit.drawBoxBorder(batch, posX + width - buttonW - 1, posY - 1, buttonW + 2, height + 2)
// text area border (again) // text area border (again)
if (!paletteShowing && mouseOnButton == 3) { 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) Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2)
} }
} }
// left button icon // left button icon
batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 1 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 1) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT 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) batch.draw(labels.get(16,0), posX + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f)
// right button icon // right button icon
batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (mouseOnButton == 2 && mousePushed) Toolkit.Theme.COL_SELECTED
else if (mouseOnButton == 2) Toolkit.Theme.COL_ACTIVE else UIItemTextLineInput.TEXTINPUT_COL_TEXT 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) batch.draw(labels.get(17,0), posX + width - buttonW + (buttonW - labels.tileW) / 2f, posY + (height - labels.tileH) / 2f)
// draw text // draw text
@@ -202,13 +202,13 @@ class UIItemTextSelector(
batch.color = palCursorCol batch.color = palCursorCol
Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2) Toolkit.drawBoxBorder(batch, posX + buttonW + 2, posY - 1, width - 2*buttonW - 4, height + 2)
// palette border // 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) Toolkit.drawBoxBorder(batch, palX-1, palY-1, palW+2, palH+2)
// palette items // palette items
labelCache.forEachIndexed { index, s -> labelCache.forEachIndexed { index, s ->
batch.color = if (index == selection) Toolkit.Theme.COL_HIGHLIGHT batch.color = if (index == selection) Toolkit.Theme.COL_SELECTED
else if (index == mouseOnPaletteItem) Toolkit.Theme.COL_ACTIVE else if (index == mouseOnPaletteItem) Toolkit.Theme.COL_MOUSE_UP
else UIItemTextLineInput.TEXTINPUT_COL_TEXT else UIItemTextLineInput.TEXTINPUT_COL_TEXT
val t = labelCache[index] val t = labelCache[index]
val tw = App.fontGame.getWidth(t) val tw = App.fontGame.getWidth(t)