More robust "is hovered" logic
This commit is contained in:
parent
dd3a08f47d
commit
3bdff50f4d
@ -657,16 +657,9 @@ abstract class MatteryScreen<T : MatteryMenu>(menu: T, inventory: Inventory, tit
|
|||||||
this.renderBackground(graphics, mouseX, mouseY, partialTick)
|
this.renderBackground(graphics, mouseX, mouseY, partialTick)
|
||||||
|
|
||||||
super.hoveredSlot = null
|
super.hoveredSlot = null
|
||||||
|
|
||||||
var hovered = false
|
var hovered = false
|
||||||
|
panels.forEach { hovered = it.tickHovered0(mouseXf, mouseYf, hovered) }
|
||||||
for (panel in panels) {
|
|
||||||
if (hovered) {
|
|
||||||
panel.unsetHovered()
|
|
||||||
} else if (panel.tickHovered0(mouseXf, mouseYf)) {
|
|
||||||
hovered = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
panels.forEach { it.tickHovered1() }
|
panels.forEach { it.tickHovered1() }
|
||||||
panels.forEach { it.tickHovered2() }
|
panels.forEach { it.tickHovered2() }
|
||||||
|
|
||||||
|
@ -1006,9 +1006,16 @@ open class EditablePanel<out S : Screen>(
|
|||||||
/**
|
/**
|
||||||
* Determining whenever panel is hovered or not
|
* Determining whenever panel is hovered or not
|
||||||
*/
|
*/
|
||||||
fun tickHovered0(mouseX: Float, mouseY: Float): Boolean {
|
fun tickHovered0(mouseX: Float, mouseY: Float, somethingElseHovered: Boolean): Boolean {
|
||||||
if (isRemoved)
|
if (isRemoved)
|
||||||
return false
|
return somethingElseHovered
|
||||||
|
else if (somethingElseHovered) {
|
||||||
|
if (parent == null)
|
||||||
|
updateAbsolutePosition()
|
||||||
|
|
||||||
|
unsetHovered()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
val potentiallyHovered: Boolean
|
val potentiallyHovered: Boolean
|
||||||
|
|
||||||
@ -1025,14 +1032,7 @@ open class EditablePanel<out S : Screen>(
|
|||||||
|
|
||||||
if (potentiallyHovered) {
|
if (potentiallyHovered) {
|
||||||
var hit = false
|
var hit = false
|
||||||
|
visibleChildrenInternal.forEach { hit = it.tickHovered0(mouseX, mouseY, hit) }
|
||||||
for (child in visibleChildrenInternal) {
|
|
||||||
if (hit) {
|
|
||||||
child.unsetHovered()
|
|
||||||
} else if (child.tickHovered0(mouseX, mouseY)) {
|
|
||||||
hit = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pendingIsHovered =
|
pendingIsHovered =
|
||||||
!hit &&
|
!hit &&
|
||||||
|
@ -22,7 +22,7 @@ class Panel2Widget<out S: Screen, out P : EditablePanel<S>>(
|
|||||||
|
|
||||||
val wrap = MGUIGraphics(graphics)
|
val wrap = MGUIGraphics(graphics)
|
||||||
|
|
||||||
panel.tickHovered0(xFloat, yFloat)
|
panel.tickHovered0(xFloat, yFloat, false)
|
||||||
panel.tickHovered1()
|
panel.tickHovered1()
|
||||||
panel.tickHovered2()
|
panel.tickHovered2()
|
||||||
panel.render(wrap, xFloat, yFloat, partialTick)
|
panel.render(wrap, xFloat, yFloat, partialTick)
|
||||||
|
Loading…
Reference in New Issue
Block a user