inventory ui itemgrid:removed inventoryfull dependency

This commit is contained in:
minjaesong
2021-03-12 10:38:53 +09:00
parent ae3bf663e0
commit bd89ca67fb
9 changed files with 123 additions and 106 deletions

View File

@@ -16,6 +16,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes
import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.toItemCountText
import net.torvald.terrarum.ui.Toolkit
import net.torvald.terrarum.ui.Toolkit.DEFAULT_BOX_BORDER_COL
import net.torvald.terrarum.ui.UICanvas
import net.torvald.terrarum.ui.UIItemTextButton
/***
@@ -24,7 +25,7 @@ import net.torvald.terrarum.ui.UIItemTextButton
* Created by minjaesong on 2017-03-16.
*/
class UIItemInventoryElem(
parentUI: UIInventoryFull,
parentUI: UICanvas,
initialX: Int,
initialY: Int,
override val width: Int,
@@ -39,7 +40,8 @@ class UIItemInventoryElem(
val backBlendMode: String = BlendMode.NORMAL,
override var quickslot: Int? = null,
override var equippedSlot: Int? = null,
val drawBackOnNull: Boolean = true
val drawBackOnNull: Boolean = true,
val listRebuildFun: () -> Unit
) : UIItemInventoryCellBase(parentUI, initialX, initialY, item, amount, itemImage, quickslot, equippedSlot) {
companion object {
@@ -49,8 +51,6 @@ class UIItemInventoryElem(
internal val durabilityBarThickness = 3f
}
private val inventoryUI = parentUI
override val height = UIItemInventoryElem.height
private val imgOffset: Float
@@ -219,7 +219,7 @@ class UIItemInventoryElem(
}
}
inventoryUI.rebuildList()
listRebuildFun()
return super.touchDown(screenX, screenY, pointer, button)
}