DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix isHovered being false when outside of parent's bounds

Browse Source
This commit is contained in:
DBotThePony 2022-09-04 17:02:53 +07:00
parent 9f6b884c8c
commit bc6bb15874
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt
View File

@ -381,6 +381,9 @@ open class EditablePanel @JvmOverloads constructor(
if (parent == null) {
absoluteX = x
absoluteY = y
} else {
if (x < 0f || y < 0f || x + width > parent.width || y + height > parent.height) {
// no op - we updated ourselves in tickHover
} else {
isHovered = parent.isHovered &&
mouseX >= absoluteX &&
@ -388,6 +391,7 @@ open class EditablePanel @JvmOverloads constructor(
mouseY >= absoluteY &&
mouseY < absoluteY + height
}
}
val scissor = this.scissor
@ -426,6 +430,23 @@ open class EditablePanel @JvmOverloads constructor(
}
open fun tickHover(mouse_x: Float, mouse_y: Float): Boolean {
if (boundingHeight > height || boundingWidth > width || boundingX < 0 || boundingY < 0) {
var hit = false
for (child in children) {
if (child.tickHover(mouse_x, mouse_y)) {
hit = true
}
}
isHovered = mouse_x >= absoluteX &&
mouse_x <= absoluteX + width &&
mouse_y >= absoluteY &&
mouse_y <= absoluteY + height
return hit
}
isHovered =
mouse_x >= absoluteX &&
mouse_x <= absoluteX + width &&