From 6a8709a1fcada359cab5827bde051c380c9c2e1b Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Mon, 26 Dec 2022 17:07:53 +0100
Subject: [PATCH] progress

---
 assets/images/desktop/ui.xml                  |   6 +++++
 assets/images/desktop/ui/textbox.png          | Bin 0 -> 234 bytes
 assets/images/desktop/ui/textboxFocus.png     | Bin 0 -> 258 bytes
 assets/images/desktop/ui/textboxHover.png     | Bin 0 -> 251 bytes
 assets/images/desktop/ui/textboxPressed.png   | Bin 0 -> 253 bytes
 buildnumber.txt                               |   2 +-
 .../funkin/desktop/editors/CharacterEditor.hx |   6 ++++-
 source/funkin/desktop/sprites/Checkbox.hx     |   6 ++++-
 source/funkin/desktop/sprites/InputBox.hx     |  22 +++++++++++++++++-
 source/funkin/desktop/theme/Theme.hx          |   8 +++++++
 10 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 assets/images/desktop/ui/textbox.png
 create mode 100644 assets/images/desktop/ui/textboxFocus.png
 create mode 100644 assets/images/desktop/ui/textboxHover.png
 create mode 100644 assets/images/desktop/ui/textboxPressed.png

diff --git a/assets/images/desktop/ui.xml b/assets/images/desktop/ui.xml
index 79c6909a..c36783a4 100644
--- a/assets/images/desktop/ui.xml
+++ b/assets/images/desktop/ui.xml
@@ -24,4 +24,10 @@
     <!-- CONTEXT MENU -->
     <contextBackground      path="context"          textColor="0,0,0"           left="4" top="4" right="4" bottom="4" />
     <contextOption          path="contextOption"    textColor="255,255,255"     height="20" />
+
+    <!-- TEXTBOX -->
+    <textbox                path="textbox"          textColor="0,0,0"           left="4" top="4" right="4" bottom="4" />
+    <textboxHover           path="textboxHover"     textColor="0,0,0"           left="4" top="4" right="4" bottom="4" />
+    <textboxPressed         path="textboxPressed"   textColor="0,0,0"           left="4" top="4" right="4" bottom="4" />
+    <textboxFocused         path="textboxFocus"     textColor="0,0,0"           left="4" top="4" right="4" bottom="4" />
 </theme>
\ No newline at end of file
diff --git a/assets/images/desktop/ui/textbox.png b/assets/images/desktop/ui/textbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..affdf708008c569eed4744e46fd3db49f4f119ae
GIT binary patch
literal 234
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz8!3HF`W%CyUDb50q$YKTtzQZ8Qcszea3Q%y4
zr;B4q#jUqj4Y}GB7}_45U+LO(fy3Heynu6#ZTjX1msqXbg;brkSbPoE`>)fxkG<mB
zbcNE#vpFgal6h9Ga*Dkkd8%?=hoO^ZtN5JflD?N0<lfdPxL@8Pps>{E!6qF6rv>kS
z>lDO>TRb=5ac1O>IKU+KL4M1%rsBSJuQwgYy<H%~eyq^vfr;;eDNTmcSgYO_#)@yb
frvKy1&98O4ORq3nsvOt}bSHzStDnm{r-UW|2a8zR

literal 0
HcmV?d00001

diff --git a/assets/images/desktop/ui/textboxFocus.png b/assets/images/desktop/ui/textboxFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..4592db0d989ec436c90fce9e67a9d9c7e40a4e49
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz8!3HF`W%CyUDb50q$YKTtzQZ8Qcszea3Q%y1
zr;B4q#jWH&|Nq-FD=R;)XVYR>5ZTkCu&eH38Jk&I8CzUj-6o!2e|{<-UO(SnQtGjd
z<N>yA>unAk(APMjprq$Etua4tU($~s|7@L8cQ7A0;CcI;k%x!3VaqGe38@cWdFxBW
z+0-7J@I2Kf>%oe~#cX|27Fi0L8hyRX4LLeH3_3hLCZ#@DEq-3|-rmZ?0pf4j3^&v~
zi(<>mi(_L{Ox(ot=fgYQ!`Ii(m$bUvEGe-v_BA8Jy1x5=ecIB`0^QHx>FVdQ&MBb@
E0NqMt00000

literal 0
HcmV?d00001

diff --git a/assets/images/desktop/ui/textboxHover.png b/assets/images/desktop/ui/textboxHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..49688263398c767dc43c52b7251f54fe1f14834c
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz8!3HF`W%CyUDb50q$YKTtzQZ8Qcszea3Q%yZ
zr;B4q#jUqj7xFbZFtmUC&uZ2$t6px?e071@-8sEk1!nT+p7DgtD!#moZT0yBjqJ?k
zO?(>9q(AOs|8cc{!Rziir6mXXmP^YVZ}g5;Ub@EXN@?%gtTwS8J%58^248jx{y1mS
zwdg>V;kyGr{x$KiEaB;KSSqwa#nnPK@<Nl?mIbW;4?h0Mc+RrrL+=5TvkSH!OS61=
yptgopHlSi&I?J=lzE{DC;^(3_tla+kFT=ZUSC|jDPp<(woWax8&t;ucLK6T3WoJDA

literal 0
HcmV?d00001

diff --git a/assets/images/desktop/ui/textboxPressed.png b/assets/images/desktop/ui/textboxPressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..21f512500a86d567b0ce67ecf0e673f7f4710036
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz8!3HF`W%CyUDb50q$YKTtzQZ8Qcszea3Q%yp
zr;B4q#jWI&hKBz<R~UPG6b`=<&rMHAPEUXE^r`ykDd*?g8~yq9bMivNbCVf!5`Ldz
z=K0gq#G~{mDMj+fv!~i^{qOG^hqPHc@XXorR;RgTi%9d59+pTpyZTQ}5073>=c$Z4
zwwSF?$|CE*ipIrkO42vBl!!M^=-_Cc(V`N`wy)~roQHR3oAZ=j%oAWfoxU#h!Lw(n
z0s=y6rw{PIzh_kQ_t(sY#<mhU3LF7zuQ4;cdwzwv_UHwWM;Sa_{an^LB{Ts5j4Ng}

literal 0
HcmV?d00001

diff --git a/buildnumber.txt b/buildnumber.txt
index a3ace50d..5093c79f 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-1793
\ No newline at end of file
+1795
\ No newline at end of file
diff --git a/source/funkin/desktop/editors/CharacterEditor.hx b/source/funkin/desktop/editors/CharacterEditor.hx
index 83515c18..98db603a 100644
--- a/source/funkin/desktop/editors/CharacterEditor.hx
+++ b/source/funkin/desktop/editors/CharacterEditor.hx
@@ -28,6 +28,7 @@ class CharacterEditor extends WindowContent {
     public var animsDropDown:DropDown;
     public var animNameInput:InputBox;
     public var animPrefixInput:InputBox;
+    public var animLoopCheckbox:Checkbox;
 
     public override function create() {
         super.create();
@@ -91,13 +92,15 @@ class CharacterEditor extends WindowContent {
         labels.push(label = new WindowText(10, animNameInput.y + animNameInput.height + 10, 0, "Animation Prefix"));
         animPrefixInput = new InputBox(10, label.y + label.height, 380, "");
 
+        animLoopCheckbox = new Checkbox(10, animPrefixInput.y + animPrefixInput.height + 10, 380, "Loop");
+
         // labels.push(label = new WindowText(10, animNameInput.y + animNameInput.height + 10, 0, "Animation Prefix"));
         // animPrefixInput = new InputBox(10, label.y + label.height, 380, "");
         
         for(l in labels)
             tabView.tabs[0].add(l);
 
-        for(spr in [animsDropDown, animNameInput, ])
+        for(spr in [animsDropDown, animNameInput, animPrefixInput, animLoopCheckbox])
             tabView.tabs[0].add(spr);
 
         refreshAnims();
@@ -110,6 +113,7 @@ class CharacterEditor extends WindowContent {
 
         animNameInput.text = anim.name;
         animPrefixInput.text = anim.name;
+        animLoopCheckbox.setChecked(anim.loop);
     }
 
     public function refreshAnims() {
diff --git a/source/funkin/desktop/sprites/Checkbox.hx b/source/funkin/desktop/sprites/Checkbox.hx
index 8a16772a..a05df1ec 100644
--- a/source/funkin/desktop/sprites/Checkbox.hx
+++ b/source/funkin/desktop/sprites/Checkbox.hx
@@ -25,6 +25,10 @@ class Checkbox extends WindowText {
         scrollFactor.set();
     }
 
+    public function setChecked(checked:Bool) {
+        this.checked = cast checked;
+    }
+
     public override function update(elapsed:Float) {
         super.update(elapsed);
         checkboxSprite.update(elapsed);
@@ -61,7 +65,7 @@ class Checkbox extends WindowText {
 }
 
 @:enum
-abstract CheckState(Null<Bool>) {
+abstract CheckState(Null<Bool>) from Null<Bool> to Null<Bool> from Bool to Bool {
     var CHECKED:CheckState = true;
     var UNCHECKED:CheckState = false;
     var BOTH:CheckState = null;
diff --git a/source/funkin/desktop/sprites/InputBox.hx b/source/funkin/desktop/sprites/InputBox.hx
index 2bc8cf01..c6dabc8d 100644
--- a/source/funkin/desktop/sprites/InputBox.hx
+++ b/source/funkin/desktop/sprites/InputBox.hx
@@ -8,6 +8,7 @@ import lime.app.Application;
 
 class InputBox extends Button {
     public var index:Int = 0;
+    public static var insertMode:Bool = false;
 
     public var text(get, set):String;
     private inline function set_text(t:String):String
@@ -20,7 +21,8 @@ class InputBox extends Button {
     public function new(x:Float, y:Float, w:Float, t:String, ?onChange:Void->Void) {
         super(x, y, t, function() {
             setIndex(label.text.length);
-        });
+            disabled = true;
+        }, DesktopMain.theme.textbox, DesktopMain.theme.textboxHover, DesktopMain.theme.textboxPressed, DesktopMain.theme.textboxFocused);
         this.resize(w, height);
         this.label.alignment = LEFT;
         FlxG.stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
@@ -33,6 +35,8 @@ class InputBox extends Button {
         switch(event.keyCode) {
             case Keyboard.ESCAPE:
                 this.loseFocus();
+            case Keyboard.INSERT:
+                insertMode = !insertMode;
             case Keyboard.LEFT:
                 changeIndex(-1);
             case Keyboard.RIGHT:
@@ -60,10 +64,26 @@ class InputBox extends Button {
 
         text = text.substr(0, index) + input + text.substring(index, text.length);
 
+        if (!insertMode)
+            index += input.length;
+
         if (onChange != null)
             onChange();
     }
 
+    public override function update(elapsed:Float) {
+        if (DesktopMain.mouseInput.justPressed && !DesktopMain.mouseInput.overlaps(this, camera)) {
+            disabled = false;
+            this.loseFocus();
+        }
+        super.update(elapsed);
+    }
+    
+    public override function onFocusLost() {
+        super.onFocusLost();
+        disabled = false;
+    }
+
     public inline function changeIndex(change:Int) {
         setIndex(Std.int(FlxMath.bound(index + change, 0, label.text.length)));
     }
diff --git a/source/funkin/desktop/theme/Theme.hx b/source/funkin/desktop/theme/Theme.hx
index 5a072665..d2f7cf27 100644
--- a/source/funkin/desktop/theme/Theme.hx
+++ b/source/funkin/desktop/theme/Theme.hx
@@ -59,6 +59,14 @@ class Theme {
     public var contextBackground:ThemeData = new ThemeData();
     public var contextOption:ThemeData = new ThemeData();
 
+    /**
+     * THEME
+     */
+    public var textbox:ThemeData = new ThemeData();
+    public var textboxHover:ThemeData = new ThemeData();
+    public var textboxPressed:ThemeData = new ThemeData();
+    public var textboxFocused:ThemeData = new ThemeData();
+
     public function new(content:String) {
         try {
             var access = new Access(Xml.parse(content).firstElement());