AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 19:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

popper: calculate position properly

Browse Source
This commit is contained in:
Bixilon 2022-02-18 15:08:26 +01:00
parent 6da5a25e6a
commit 870a691c7e
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/de/bixilon/minosoft/gui/rendering/gui/popper/Popper.kt
View File

@ -21,6 +21,7 @@ import de.bixilon.minosoft.gui.rendering.gui.elements.primitive.ColorElement
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexConsumer
import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexOptions import de.bixilon.minosoft.gui.rendering.gui.mesh.GUIVertexOptions
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.EMPTY
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.isSmaller
import glm_.vec2.Vec2i import glm_.vec2.Vec2i
abstract class Popper( abstract class Popper(
@ -29,7 +30,7 @@ abstract class Popper(
) : Element(guiRenderer), LayoutedElement { ) : Element(guiRenderer), LayoutedElement {
private val background = ColorElement(guiRenderer, Vec2i.EMPTY, color = ChatColors.DARK_BLUE) private val background = ColorElement(guiRenderer, Vec2i.EMPTY, color = ChatColors.DARK_BLUE)
open var dead = false open var dead = false
override var layoutOffset: Vec2i = position override var layoutOffset: Vec2i = EMPTY
protected set protected set
var position = position var position = position
set(value) { set(value) {
@ -45,11 +46,36 @@ abstract class Popper(
} }
override fun forceSilentApply() { override fun forceSilentApply() {
layoutOffset = position // ToDo calculateLayoutOffset()
background.size = size background.size = size
cacheUpToDate = false cacheUpToDate = false
} }
private fun calculateLayoutOffset() {
val windowSize = guiRenderer.scaledSize
val position = position
val size = size
// must not be at the position
// always try to make it on top of the position
// ToDo: if not possible, try: left -> right -> below
// if nothing is possible use (0|0)
val layoutOffset: Vec2i
// top
layoutOffset = position - Vec2i(0, size.y + POSITION_OFFSET)
if (!(layoutOffset isSmaller EMPTY)) {
layoutOffset.x = minOf(maxOf(layoutOffset.x - size.x / 2 - POSITION_OFFSET, 0), windowSize.x - size.x) // try to center element, but clamp on edges (try not to make the popper go out of the window)
this.layoutOffset = layoutOffset
return
}
// failover
this.layoutOffset = EMPTY
}
fun show() { fun show() {
guiRenderer.popper += this guiRenderer.popper += this
} }
@ -57,4 +83,9 @@ abstract class Popper(
fun hide() { fun hide() {
dead = true dead = true
} }
companion object {
private val EMPTY = Vec2i.EMPTY
private const val POSITION_OFFSET = 5
}
} }

7
src/main/java/de/bixilon/minosoft/gui/rendering/gui/popper/text/TextPopper.kt
View File

@ -29,7 +29,7 @@ class TextPopper(
private val textElement = TextElement(guiRenderer, text, background = false, parent = this) private val textElement = TextElement(guiRenderer, text, background = false, parent = this)
init { init {
recalculateSize() forceSilentApply()
} }
override fun forceRender(offset: Vec2i, consumer: GUIVertexConsumer, options: GUIVertexOptions?) { override fun forceRender(offset: Vec2i, consumer: GUIVertexConsumer, options: GUIVertexOptions?) {
@ -38,6 +38,11 @@ class TextPopper(
textElement.render(offset, consumer, options) textElement.render(offset, consumer, options)
} }
override fun forceSilentApply() {
recalculateSize()
super.forceSilentApply()
}
override fun onChildChange(child: Element) { override fun onChildChange(child: Element) {
recalculateSize() recalculateSize()
} }