From 914ce1bca5e4dd212fed289c8fd78f4f69fea982 Mon Sep 17 00:00:00 2001
From: soywiz <soywiz@gmail.com>
Date: Sun, 26 Jan 2020 23:01:51 +0100
Subject: [PATCH] Updated to 1.5.6.0

---
 gradle.properties                           |  2 +-
 sample-ui/src/commonMain/kotlin/SampleUi.kt | 22 ++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 44712ab..e1d433f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-korgePluginVersion=1.5.5.0
+korgePluginVersion=1.5.6.0
 
 org.gradle.jvmargs=-Xmx1536m
 org.gradle.parallel=true
diff --git a/sample-ui/src/commonMain/kotlin/SampleUi.kt b/sample-ui/src/commonMain/kotlin/SampleUi.kt
index a60cfba..57cc4f3 100644
--- a/sample-ui/src/commonMain/kotlin/SampleUi.kt
+++ b/sample-ui/src/commonMain/kotlin/SampleUi.kt
@@ -2,7 +2,7 @@ import com.soywiz.klock.*
 import com.soywiz.korge.*
 import com.soywiz.korge.html.*
 import com.soywiz.korge.input.*
-import com.soywiz.korge.newui.*
+import com.soywiz.korge.ui.*
 import com.soywiz.korge.render.*
 import com.soywiz.korge.scene.*
 import com.soywiz.korge.tween.*
@@ -22,17 +22,20 @@ import com.soywiz.korma.interpolation.*
 suspend fun main() = Korge(quality = GameWindow.Quality.PERFORMANCE, title = "UI") {
 	val nativeProcess = NativeProcess(views)
 
-	uiSkin(OtherUISkin()) {
-		uiButton(256.0, 32.0) {
-			label = "Disabled Button"
+	//uiSkin(OtherUISkin()) {
+	defaultUISkin = OtherUISkin()
+	defaultUIFont = Html.FontFace.Bitmap(resourcesVfs["uifont.fnt"].readBitmapFontWithMipmaps())
+	run {
+		uiTextButton(256.0, 32.0) {
+			text = "Disabled Button"
 			position(128, 128)
 			onClick {
 				println("CLICKED!")
 			}
 			disable()
 		}
-		uiButton(256.0, 32.0) {
-			label = "Enabled Button"
+		uiTextButton(256.0, 32.0) {
+			text = "Enabled Button"
 			position(128, 128 + 32)
 			onClick {
 				println("CLICKED!")
@@ -68,7 +71,7 @@ suspend fun main() = Korge(quality = GameWindow.Quality.PERFORMANCE, title = "UI
 		}) {
 
 			for (n in 0 until 16) {
-				uiButton(label = "HELLO $n").position(0, n * 64)
+				uiTextButton(text = "HELLO $n").position(0, n * 64)
 			}
 		}
 
@@ -101,9 +104,10 @@ suspend fun OtherUISkin(): UISkin = OtherUISkinOnce {
 		normal = ui.sliceWithSize(0, 0, 64, 64),
 		hover = ui.sliceWithSize(64, 0, 64, 64),
 		down = ui.sliceWithSize(127, 0, 64, 64),
-		backColor = DefaultUISkin.backColor.transform(otherColorTransform),
+		backColor = DefaultUISkin.backColor.transform(otherColorTransform)
+		//,
 		//font = Html.FontFace.Bitmap(getDebugBmpFontOnce())
-		font = Html.FontFace.Bitmap(resourcesVfs["uifont.fnt"].readBitmapFontWithMipmaps())
+		//font = Html.FontFace.Bitmap(resourcesVfs["uifont.fnt"].readBitmapFontWithMipmaps())
 	)
 }