maybe so?

Mnemotechnician · Jan 2, 2022 · d824aae · d824aae
1 parent 1a3d082
commit d824aae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lib/src/main/kotlin/com/github/mnemotechnician/mkui/Layout.kt b/lib/src/main/kotlin/com/github/mnemotechnician/mkui/Layout.kt
@@ -34,7 +34,7 @@ inline fun Table.addTable(background: Drawable = Styles.none, constructor: Table
 }
 
 /** Adds a collapser constructed by a lambda to the existing table and returns the created cell */
-inline fun Table.addCollapser(background: Drawable = Styles.none, shown: Boolean = true, constructor: Table.() -> Unit = {}): Cell<Collapser> {
+inline fun Table.addCollapser(shown: Boolean = true, background: Drawable = Styles.none, constructor: Table.() -> Unit = {}): Cell<Collapser> {
 	val table = Table(background)
 	table.constructor()
 
@@ -43,8 +43,8 @@ inline fun Table.addCollapser(background: Drawable = Styles.none, shown: Boolean
 }
 
 /** Adds a collapser constructed by a lambda to the existing table and returns the created cell. Whether it's shown is determined by the lambda. */
-inline fun Table.addCollapser(background: Drawable = Styles.none, crossinline shown: () -> Boolean = { true }, animate: Boolean = false, constructor: Table.() -> Unit = {}): Cell<Collapser> {
-	val cell = addCollapser(background, shown(), constructor)
+inline fun Table.addCollapser(crossinline shown: () -> Boolean = { true }, background: Drawable = Styles.none, animate: Boolean = false, constructor: Table.() -> Unit = {}): Cell<Collapser> {
+	val cell = addCollapser(shown(), background, constructor)
 	cell.get().setCollapsed(animate) { !shown() }
 	return cell;
 }

diff --git a/lib/src/main/kotlin/com/github/mnemotechnician/mkui/windows/WindowManager.kt b/lib/src/main/kotlin/com/github/mnemotechnician/mkui/windows/WindowManager.kt
@@ -17,7 +17,7 @@ import com.github.mnemotechnician.mkui.*
 object WindowManager {
 
 	internal val windowGroup = WidgetGroup()
-	val windows = Seq<Window>()
+	internal val windows = Seq<Window>()
 
 	init {
 		Events.run(EventType.ClientLoadEvent::class.java) {
@@ -56,13 +56,13 @@ object WindowManager {
 
 			//top bar — name, buttons and also a way to drag the table
 			addTable(Styles.black3) {
-				addLabel({ window.name }, ellipsis = "...").fillX()
+				addLabel({ window.name }, ellipsis = "...").growX()
 
 				//collapse/show
 				textToggle("-", Styles.togglet) {
 					childAs<Label>(0).setText(if (it) "[accent]=" else "[accent]-")
 
-					collapser.toggle()
+					collapser.setCollapsed(true, it)
 					window.isCollapsed = it
 					window.onToggle(it)
 				}
@@ -79,8 +79,8 @@ object WindowManager {
 					}
 
 					override fun touchDragged(event: InputEvent, x: Float, y: Float, pointer: Int) {
-						val oldPos = window.rootTable.localToParentCoordinates(Tmp.v1.set(x, y))
-						window.rootTable.setPosition(oldPos.x, oldPos.y)
+						val pos = window.rootTable.localToParentCoordinates(Tmp.v1.set(x, y))
+						window.rootTable.setPosition(pos.x, pos.y)
 
 						window.onDrag()
 					}
@@ -94,12 +94,12 @@ object WindowManager {
 			row()
 
 			//main container
-			collapser = addCollapser(animate = true) {
+			collapser = addCollapser(true) {
 				setClip(true)
 
 				window.table = this
 				window.onCreate()
-			}.pad(5f).get()
+			}.grow().pad(5f).get()
 		}
 
 		windowGroup.addChild(windowTable)