src/main/kotlin/net/shadowfacts/asmr/TestCacaoScreen.kt

@@ -8,8 +8,8 @@ import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.Axis
 import net.shadowfacts.cacao.geometry.Size
 import net.shadowfacts.cacao.util.Color
-import net.shadowfacts.cacao.util.texture.NinePatchTexture
+import net.shadowfacts.cacao.util.NinePatchTexture
-import net.shadowfacts.cacao.util.texture.Texture
+import net.shadowfacts.cacao.util.Texture
 import net.shadowfacts.cacao.view.*
 import net.shadowfacts.cacao.view.button.DropdownButton
 
@@ -26,7 +26,8 @@ class TestCacaoScreen: CacaoScreen() {
 			val red = stack.addArrangedSubview(TextureView(Texture(Identifier("textures/block/birch_log_top.png"), 0, 0, 16, 16)).apply {
 				intrinsicContentSize = Size(50.0, 50.0)
 			})
-			val green = stack.addArrangedSubview(NinePatchView(NinePatchTexture.PANEL_BG).apply {
+			val buttonNinePatch = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 66), 3, 3, 194, 14)
+			val green = stack.addArrangedSubview(NinePatchView(buttonNinePatch).apply {
 				intrinsicContentSize = Size(75.0, 100.0)
 			})
 			val blue = stack.addArrangedSubview(View().apply {
@@ -45,9 +46,9 @@ class TestCacaoScreen: CacaoScreen() {
 			})
 
 			solver.dsl {
-				stack.topAnchor equalTo 0
+				stack.topAnchor equalTo 50
-				stack.centerXAnchor equalTo this@apply.centerXAnchor
+				stack.leftAnchor equalTo 50
-				stack.widthAnchor equalTo 100
+				stack.rightAnchor equalTo 150
 				purple.centerXAnchor equalTo blue.centerXAnchor
 				purple.centerYAnchor equalTo blue.centerYAnchor
 //				purple.widthAnchor equalTo 50

src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt

@@ -1,13 +1,11 @@
 package net.shadowfacts.cacao
 
-import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.network.chat.TextComponent
 import net.minecraft.sound.SoundEvents
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.util.MouseButton
 import net.shadowfacts.cacao.util.RenderHelper
-import net.shadowfacts.kiwidsl.dsl
 import java.util.*
 
 /**
@@ -48,14 +46,6 @@ open class CacaoScreen: Screen(TextComponent("CacaoScreen")) {
 		_windows.remove(window)
 	}
 
-	override fun init() {
-		super.init()
-
-		windows.forEach {
-			it.resize(width, height)
-		}
-	}
-
 	override fun render(mouseX: Int, mouseY: Int, delta: Float) {
 		if (minecraft != null) {
 			// workaround this.minecraft sometimes being null causing a crash

src/main/kotlin/net/shadowfacts/cacao/Window.kt

@@ -3,10 +3,7 @@ package net.shadowfacts.cacao
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.util.MouseButton
 import net.shadowfacts.cacao.view.View
-import net.shadowfacts.kiwidsl.dsl
-import no.birkett.kiwi.Constraint
 import no.birkett.kiwi.Solver
-import no.birkett.kiwi.Variable
 import java.util.*
 
 /**
@@ -25,49 +22,8 @@ class Window {
 	 */
 	lateinit var screen: CacaoScreen
 
-	/**
-	 * The constraint solver used by this window and all its views and subviews.
-	 */
 	var solver = Solver()
 
-	/**
-	 * Layout anchor for the left edge of this view in the window's coordinate system.
-	 */
-	val leftAnchor = Variable("left")
-	/**
-	 * Layout anchor for the right edge of this view in the window's coordinate system.
-	 */
-	val rightAnchor = Variable("right")
-	/**
-	 * Layout anchor for the top edge of this view in the window's coordinate system.
-	 */
-	val topAnchor = Variable("top")
-	/**
-	 * Layout anchor for the bottom edge of this view in the window's coordinate system.
-	 */
-	val bottomAnchor = Variable("bottom")
-	/**
-	 * Layout anchor for the width of this view in the window's coordinate system.
-	 */
-	val widthAnchor = Variable("width")
-	/**
-	 * Layout anchor for the height of this view in the window's coordinate system.
-	 */
-	val heightAnchor = Variable("height")
-	/**
-	 * Layout anchor for the center X position of this view in the window's coordinate system.
-	 */
-	val centerXAnchor = Variable("centerX")
-	/**
-	 * Layout anchor for the center Y position of this view in the window's coordinate system.
-	 */
-	val centerYAnchor = Variable("centerY")
-
-	// internal constraints that specify the window size based on the MC screen size
-	// stored so that they can be removed when the screen is resized
-	private var widthConstraint: Constraint? = null
-	private var heightConstraint: Constraint? = null
-
 	// _views is the internal, mutable object, since we only want it to be mutated by the add/removeView methods
 	private val _views = LinkedList<View>()
 	/**
@@ -78,40 +34,6 @@ class Window {
 
 	private var viewsSortedByZIndex: List<View> = listOf()
 
-	init {
-		createInternalConstraints()
-	}
-
-	/**
-	 * Creates the internal constraints used by the window.
-	 * If overridden, the super-class method must be called.
-	 */
-	protected open fun createInternalConstraints() {
-		solver.dsl {
-			leftAnchor equalTo 0
-			topAnchor equalTo 0
-
-			rightAnchor equalTo (leftAnchor + widthAnchor)
-			bottomAnchor equalTo (topAnchor + heightAnchor)
-			centerXAnchor equalTo (leftAnchor + widthAnchor / 2)
-			centerYAnchor equalTo (topAnchor + heightAnchor / 2)
-		}
-	}
-
-	/**
-	 * Called by the window's [screen] when the Minecraft screen is resized.
-	 * Used to update the window's width and height constraints and re-layout views.
-	 */
-	internal fun resize(width: Int, height: Int) {
-		if (widthConstraint != null) solver.removeConstraint(widthConstraint)
-		if (heightConstraint != null) solver.removeConstraint(heightConstraint)
-		solver.dsl {
-			widthConstraint = (widthAnchor equalTo width)
-			heightConstraint = (heightAnchor equalTo height)
-		}
-		layout()
-	}
-
 	/**
 	 * Convenience method that removes this window from its [screen].
 	 */

src/main/kotlin/net/shadowfacts/cacao/util/NinePatchTexture.kt

@@ -1,6 +1,4 @@
-package net.shadowfacts.cacao.util.texture
+package net.shadowfacts.cacao.util
-
-import net.minecraft.util.Identifier
 
 /**
  * Helper class that represents a texture that can be divided into nine pieces (4 corners, 4 edges, and the center)
@@ -17,20 +15,12 @@ import net.minecraft.util.Identifier
  */
 data class NinePatchTexture(val texture: Texture, val cornerWidth: Int, val cornerHeight: Int, val centerWidth: Int, val centerHeight: Int) {
 
-	companion object {
-		val PANEL_BG = NinePatchTexture(Texture(Identifier("textures/gui/demo_background.png"), 0, 0), 5, 5, 238, 156)
-
-		val BUTTON_BG = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 66), 3, 3, 194, 14)
-		val BUTTON_HOVERED_BG = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 86), 3, 3, 194, 14)
-		val BUTTON_DISABLED_BG = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 46), 3, 3, 194, 14)
-	}
-
 	// Corners
 	val topLeft by lazy {
 		texture
 	}
 	val topRight by lazy {
-		Texture(texture.location, texture.u + cornerWidth + centerWidth, texture.v, texture.width, texture.height)
+		Texture(texture.location, texture.u  + cornerWidth + centerWidth, texture.v, texture.width, texture.height)
 	}
 	val bottomLeft by lazy {
 		Texture(texture.location, texture.u, texture.v + cornerHeight + centerHeight, texture.width, texture.height)

src/main/kotlin/net/shadowfacts/cacao/util/RenderHelper.kt

@@ -8,7 +8,6 @@ import net.minecraft.client.render.VertexFormats
 import net.minecraft.client.sound.PositionedSoundInstance
 import net.minecraft.sound.SoundEvent
 import net.shadowfacts.cacao.geometry.Rect
-import net.shadowfacts.cacao.util.texture.Texture
 import org.lwjgl.opengl.GL11
 
 /**

src/main/kotlin/net/shadowfacts/cacao/util/Texture.kt

@@ -1,4 +1,4 @@
-package net.shadowfacts.cacao.util.texture
+package net.shadowfacts.cacao.util
 
 import net.minecraft.util.Identifier
 

src/main/kotlin/net/shadowfacts/cacao/view/NinePatchView.kt

@@ -2,7 +2,7 @@ package net.shadowfacts.cacao.view
 
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Rect
-import net.shadowfacts.cacao.util.texture.NinePatchTexture
+import net.shadowfacts.cacao.util.NinePatchTexture
 import net.shadowfacts.cacao.util.RenderHelper
 import net.shadowfacts.cacao.util.properties.ResettableLazyProperty
 

src/main/kotlin/net/shadowfacts/cacao/view/TextureView.kt

@@ -2,7 +2,7 @@ package net.shadowfacts.cacao.view
 
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.util.RenderHelper
-import net.shadowfacts.cacao.util.texture.Texture
+import net.shadowfacts.cacao.util.Texture
 
 /**
  * A helper class for drawing a [Texture] in a view.

src/main/kotlin/net/shadowfacts/cacao/view/View.kt

@@ -207,7 +207,7 @@ open class View() {
 	 * Called during [wasAdded] to add any constraints to the [solver] that are internal to this view.
 	 * If overridden, the super-class method must be called.
 	 */
-	protected open fun createInternalConstraints() {
+	open fun createInternalConstraints() {
 		if (!usesConstraintBasedLayout) return
 
 		solver.dsl {

src/main/kotlin/net/shadowfacts/cacao/view/button/AbstractButton.kt

@@ -1,9 +1,11 @@
 package net.shadowfacts.cacao.view.button
 
+import net.minecraft.util.Identifier
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.util.MouseButton
-import net.shadowfacts.cacao.util.texture.NinePatchTexture
+import net.shadowfacts.cacao.util.NinePatchTexture
 import net.shadowfacts.cacao.util.RenderHelper
+import net.shadowfacts.cacao.util.Texture
 import net.shadowfacts.cacao.view.NinePatchView
 import net.shadowfacts.cacao.view.View
 import net.shadowfacts.kiwidsl.dsl
@@ -21,6 +23,12 @@ import net.shadowfacts.kiwidsl.dsl
  */
 abstract class AbstractButton<Impl: AbstractButton<Impl>>(val content: View, val padding: Double = 4.0): View() {
 
+	companion object {
+		val DEFAULT_BG = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 66), 3, 3, 194, 14)
+		val HOVERED_BG = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 86), 3, 3, 194, 14)
+		val DISABLED_BG = NinePatchTexture(Texture(Identifier("textures/gui/widgets.png"), 0, 46), 3, 3, 194, 14)
+	}
+
 	/**
 	 * The function that handles when this button is clicked.
 	 * The parameter is the type of the concrete button implementation that was used.
@@ -42,19 +50,19 @@ abstract class AbstractButton<Impl: AbstractButton<Impl>>(val content: View, val
 	 * If a [backgroundColor] is specified, it will be drawn behind the background View and thus not visible
 	 * unless the background view is not fully opaque.
 	 */
-	var background: View? = NinePatchView(NinePatchTexture.BUTTON_BG)
+	var background: View? = NinePatchView(DEFAULT_BG)
 	/**
 	 * The background to draw when the button is hovered over by the mouse.
 	 * If `null`, the normal [background] will be used.
 	 * @see background
 	 */
-	var hoveredBackground: View? = NinePatchView(NinePatchTexture.BUTTON_HOVERED_BG)
+	var hoveredBackground: View? = NinePatchView(HOVERED_BG)
 	/**
 	 * The background to draw when the button is [disabled].
 	 * If `null`, the normal [background] will be used.
 	 * @see background
 	 */
-	var disabledBackground: View? = NinePatchView(NinePatchTexture.BUTTON_DISABLED_BG)
+	var disabledBackground: View? = NinePatchView(DISABLED_BG)
 
 	override fun wasAdded() {
 		solver.dsl {

src/main/kotlin/net/shadowfacts/cacao/view/button/DropdownButton.kt

@@ -6,8 +6,8 @@ import net.shadowfacts.cacao.geometry.Axis
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Rect
 import net.shadowfacts.cacao.util.MouseButton
-import net.shadowfacts.cacao.util.texture.NinePatchTexture
+import net.shadowfacts.cacao.util.NinePatchTexture
-import net.shadowfacts.cacao.util.texture.Texture
+import net.shadowfacts.cacao.util.Texture
 import net.shadowfacts.cacao.util.properties.ResettableLazyProperty
 import net.shadowfacts.cacao.view.NinePatchView
 import net.shadowfacts.cacao.view.StackView
@@ -89,7 +89,7 @@ class DropdownButton<Value, ContentView: View>(
 
 	private fun showDropdown() {
 		val dropdownWindow = window.screen.addWindow(Window())
-		val dropdownBackground = dropdownWindow.addView(NinePatchView(NinePatchTexture.BUTTON_BG).apply {
+		val dropdownBackground = dropdownWindow.addView(NinePatchView(DEFAULT_BG).apply {
 			zIndex = -1.0
 		})
 		val stack = dropdownWindow.addView(StackView(Axis.VERTICAL, StackView.Distribution.LEADING))
@@ -100,8 +100,8 @@ class DropdownButton<Value, ContentView: View>(
 			val contentView = createView(value)
 			val button = stack.addArrangedSubview(Button(contentView, padding).apply {
 				background = null
-				hoveredBackground = DropdownItemBackgroundView(index == 0, index == last, NinePatchTexture.BUTTON_HOVERED_BG)
+				hoveredBackground = DropdownItemBackgroundView(index == 0, index == last, HOVERED_BG)
-				disabledBackground = DropdownItemBackgroundView(index == 0, index == last, NinePatchTexture.BUTTON_DISABLED_BG)
+				disabledBackground = DropdownItemBackgroundView(index == 0, index == last, DISABLED_BG)
 				disabled = value == this@DropdownButton.value
 				handler = {
 					dropdownWindow.removeFromScreen()

src/main/kotlin/net/shadowfacts/cacao/view/button/ToggleButton.kt

@@ -4,7 +4,7 @@ import net.minecraft.util.Identifier
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Size
 import net.shadowfacts.cacao.util.MouseButton
-import net.shadowfacts.cacao.util.texture.Texture
+import net.shadowfacts.cacao.util.Texture
 import net.shadowfacts.cacao.view.TextureView
 
 /**