conflict fixes

bladekt · bladekt · commit 6f98bb96b715 · 2024-05-26T23:27:59.000+03:00
diff --git a/common/src/main/kotlin/com/lambda/gui/api/component/button/InputBarOverlay.kt b/common/src/main/kotlin/com/lambda/gui/api/component/button/InputBarOverlay.kt
@@ -94,8 +94,8 @@ abstract class InputBarOverlay (val renderer: RenderLayer, owner: ChildLayer.Dra
 
                 if (isKeyBind) {
                     val key = when (e.key) {
-                        KeyCode.Delete, KeyCode.Backspace -> KeyCode.Unbound
-                        KeyCode.Escape -> return
+                        KeyCode.DELETE, KeyCode.BACKSPACE -> KeyCode.UNBOUND
+                        KeyCode.ESCAPE -> return
                         else -> e.key
                     }
 
@@ -105,12 +105,12 @@ abstract class InputBarOverlay (val renderer: RenderLayer, owner: ChildLayer.Dra
                 }
 
                 when (e.key) {
-                    KeyCode.Enter -> {
+                    KeyCode.ENTER -> {
                         setStringValue(typed)
                         toggle()
                     }
 
-                    KeyCode.Backspace -> {
+                    KeyCode.BACKSPACE -> {
                         typed = typed.dropLast(1)
                         typeAnimation = -1.0
                     }

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ abstract class InputBarOverlay (val renderer: RenderLayer, owner: ChildLayer.Dra`
`94`	`94`
`95`	`95`	`if (isKeyBind) {`
`96`	`96`	`val key = when (e.key) {`
`97`		`- KeyCode.Delete, KeyCode.Backspace -> KeyCode.Unbound`
`98`		`- KeyCode.Escape -> return`
	`97`	`+ KeyCode.DELETE, KeyCode.BACKSPACE -> KeyCode.UNBOUND`
	`98`	`+ KeyCode.ESCAPE -> return`
`99`	`99`	`else -> e.key`
`100`	`100`	`}`
`101`	`101`
`@@ -105,12 +105,12 @@ abstract class InputBarOverlay (val renderer: RenderLayer, owner: ChildLayer.Dra`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`when (e.key) {`
`108`		`- KeyCode.Enter -> {`
	`108`	`+ KeyCode.ENTER -> {`
`109`	`109`	`setStringValue(typed)`
`110`	`110`	`toggle()`
`111`	`111`	`}`
`112`	`112`
`113`		`- KeyCode.Backspace -> {`
	`113`	`+ KeyCode.BACKSPACE -> {`
`114`	`114`	`typed = typed.dropLast(1)`
`115`	`115`	`typeAnimation = -1.0`
`116`	`116`	`}`