From e3fc778c040e499aba173265937305aa540ce111 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Sat, 9 Dec 2023 14:29:52 -0700
Subject: [PATCH] ok i added the buttons

---
 assets/images/editors/ui/context-icons.png | Bin 1114 -> 1021 bytes
 source/funkin/editors/charter/Charter.hx   |  42 +++++++++++++++++++++
 source/funkin/editors/ui/UIContextMenu.hx  |  17 +++++++--
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/assets/images/editors/ui/context-icons.png b/assets/images/editors/ui/context-icons.png
index 7bf464486da3e6eeb6892501dd015dc75a996578..919766562e370878e90982869bc424a1f6d80754 100644
GIT binary patch
literal 1021
zcmV<Z0|NYsP)<h;3K|Lk000e1NJLTq002+`000yS1^@s68rZtm00001b5ch_0Itp)
z=>Px&w@E}nR9J=Gn7?ZrM-<0D?{sGo5;+{k%C8kfML^f+4@luUU1|q%kaWUzu>XXl
z4u(`QoQ+(hvXUZ=8W%}v<3<NAV#o@NAyJ5J<g<PEQq0cm?A+|$oV>;&Ul?w8cJ}St
z&%HNqc0^T4lr*#%pn!_VG}Yk$LEXf07F4JBT@jII_M)o3g@HKT%ClA+8)tbdc3Mzf
zgbAbp^x<`YmEyi*H$VhceWw`rvdP#u%PS6T<(VY-@TSz1o(jk!fId76t|uZ#a|1=5
z6cB3_!t?s1t;lUr&ex-VzjK{G|MCOFFaB`n7GPZz`0#odcz@fA`L+81WM6#}+MAOP
z@2Xx0;F5gloE>Mm0Gtw#6?lIhe(zoCRR(sMF9_CvJ+6hfzq1!UxU<N!t9qSFzkgF6
zmk>{jDp}G$dzpI&^?zz7Xe*Sd>Qa_8c&%uh<#h!_U$Lbqnzq}6`hw=FDhATTHVn8k
zz-kk`U-h<cZ|0wjvs`UUbiVFolh;}c>?d8fY3oPc_8{l(onB@B0~29g%(CQ3U~nDi
zh{!|R5rcPga?8KRtpQ`u?A#ajMbg-xLMnPN9LBn9_3>zwGOTvayLXVe2n^r}fT-%*
z5qNW21W#4_z+`Z^aa@7-+xsamQ0mi%{+T}~^I$mS;KmKpv%a2W?x&|u`SJ1N(4Mb`
zf?*ViJZGnaS2^=*_g!W6l>qM?X8l)5;ici7^q!OJmEb{HJOJ3=*<*iauL3av-g)2!
z24M9w?)GHK_c_5mj~<mR)?cr=Y8z@1Jg8Z>`4AVtdk=Vy0XPkv;>r<x+pikGuv$G2
zfnAwfqsJA4(+td4CGsr1?LqDeM+!VJbKtuo@(;kp)zA4%E<~Rgf%gIM446=+?`&|m
zp%5=34yJ`@;l-i(4m(?4udPM>tCKhX`8E}*Y3nalM!TCy@W4c%OS_wsTd>L;#0b2P
zFz}ui_s=MIWc-INj>rhStvr*u&4d6*E3%Q-RBh|j0j5O-1q?)gZ5M&Jfq`e!)@@})
z?1x`CO%lvEacpcG8xBz$e%g+9H<x~{jldVGdQL?Cf-(}_aiId<F(&eC(Fh~&b*c4T
zoBr9$jCMD<d&itF6M1fss@l)C9&pA&45g|cV&*#w&(3?5=o=hv0MY%t60%KWFMY$v
zd(HcSi~jKBKdVc1?WU^Q54Wp|rOHdH%ax|ot#itZ4d%U5wkNohFI~(_S%?bERCNs#
rmG-5lUh@mavZ*^)Sl$r4)}HwvlBo#P%=o{(00000NkvXXu0mjfHaqo6

literal 1114
zcmV-g1f~0lP)<h;3K|Lk000e1NJLTq002Ay000yS1^@s6(F0y700001b5ch_0Itp)
z=>Px(6iGxuR9J=0m_cY9RT#&AZ!()~vrUuICQDeCjfqyKm5L>L=tU_aBF(W8Dnc)U
zFo$*tq>Ey_sI9HF5ex`=D2Rdu5wX2Vs0S-*$e|FUmL?n47`D;G6x(FGyYoD}dD*ww
zNiva|^ba5JF|+&L{O0@5_uh<<QW8>Pjqm^oNM|}(4m;px>6Zt7U+&u>|D(YyzpeB8
zmVdsCg1+xyS1Js!32UKXZNIJae^c^9_-$x8ZbFU^O^YzUJ=$FgZAY!oM(nDw*8?_T
zHE6_$I+T@*Kw+a7<G2ZVrso{}Zr{4l9i2C2wxMC8Q*g99CI=J)Pyt?TG80xqHULqe
ze(ZC43b)AEQ9juJ5+9=AL&<Ry((OLM)J%@B&;VBp;qU9gfE#2}TYx}axbB;<QJ@jn
zHt`Mn3%58WC6RKGPJb+m5Yn)z_9Rm?Ii_ZExZNihatGIi4uaT-tQDc3OPg8?YuLv8
zH9G#D<b5fL2#fC?eSx!KCv@C|Jb&6_Xk?J7nOxPmGd<^U+(e*DvJ-9Mj}2rOpd%Km
zd4|oZ8wrSdDi&@88gJ*>HT@&+O37|vG12)9uSQ}lQK{7H!shd{WYT$tMh2_S>r97%
zHmx1h4}#UewjcFA*tUR(0ga_4ntr>?>(b*9Ay{ZXKwnD-f1!$2i8Yob$4$sgI!``7
zyL@aVbgDhc(8wTRtM-49S&$m2zy-$GMPBww91?<JbBg}<17uOvxxgC0I<rC2(5dz$
z{a^R}udq<baKp7vcxCh>M#nC41ZehS2hap;AOC{qOG_LBh_>){*RzZOi@*|a7X@5H
zW!l(OJl?w8&!qF40t=O5WqT#Mq-1wtfwv}yc@hP?18ABY=JCZjG5~gz3ww`n83n6>
z11-H4ta<G8`S_;5g0YP3>*cIf$G1`vnZLn1vp<spw$F}{oWH@FQWCLjhWGXIG1ahl
zQNU#a*5P!<s><e8!h!<!fN~_p(nHTNAS|v+$<EwW2Ij64&wbAuQqn9ee%*7JQ+AYp
zfIHN}dKi{=+=M*d>j2fz8a5tp-E>$`z-5#ji%kjU6Hky4f_drjaP|uCNsmq;_%nHs
z*J5qV0k=`G8rX!b$?)-BhcCbSfpn&NPm<19n+^-rzy)A2{uq-xyErKXo|Loz-mX2I
zY~4$iYFIO~l2x{qPrrD9E1w<%lzq1<vsyOlqKi}tn0W9IKP^mgsa)i6U4%=irx-=q
z_zvpX)m7O9u8|2_vG@2rfi<_7tM!8<q?CFaY3{6a2oy}g2o0;3p{ndU)5+z*gLX{!
z0=A>`=DIH_*@?F0dCU(0LQ1*vJvU;sx~S=8$6S5_t!x6{FIxG<LsF@(y077MhRa5n
g1!}`D<Xf$O0rY6qCGE*Te*gdg07*qoM6N<$f^F3lPXGV_

diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index e8bf93e4..cb2b7522 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1,5 +1,6 @@
 package funkin.editors.charter;
 
+import funkin.editors.ui.UIContextMenu.UIContextMenuOptionSpr;
 import funkin.editors.ui.UITopMenu.UITopMenuButton;
 import funkin.editors.charter.CharterStrumline;
 import funkin.editors.charter.CharterBackdropGroup.EventBackdrop;
@@ -268,6 +269,22 @@ class Charter extends UIState {
 						onSelect: _note_selectmeasure
 					},
 					null,
+					{
+						label: "Add Note Type",
+						closeOnSelect: false,
+						onSelect: function (p) {trace(p);}
+					},
+					{
+						label: "Edit Note Type",
+						closeOnSelect: false,
+						onSelect: function (p) {trace(p);}
+					},
+					{
+						label: "Delete Note Type",
+						closeOnSelect: false,
+						onSelect: function (p) {trace(p);}
+					},
+					null,
 					{
 						label: "(0) Default Note",
 						keybind: [ZERO]
@@ -1426,6 +1443,31 @@ class Charter extends UIState {
 				onSelect: _note_selectmeasure
 			},
 			null,
+			{
+				label: "Add Note Type",
+				color: 0xFF1E8020, icon: 2,
+				onCreate: function (button:UIContextMenuOptionSpr) {button.label.offset.x = button.icon.offset.x = -2;},
+				closeOnSelect: false,
+				onSelect: function (_) {
+					var addButton:UIContextMenuOptionSpr = _.button;
+					trace(addButton, addButton.label.text);
+				},
+			},
+			{
+				label: "Edit Note Type",
+				color: 0xFF959829, icon: 4,
+				onCreate: function (button:UIContextMenuOptionSpr) {button.label.offset.x = button.icon.offset.x = -2;},
+				closeOnSelect: false,
+				onSelect: function (p) {trace(p);},
+			},
+			{
+				label: "Delete Note Type",
+				color: 0xFF8F2222, icon: 3,
+				onCreate: function (button:UIContextMenuOptionSpr) {button.label.offset.x = button.icon.offset.x = -2; button.icon.offset.y = -1;},
+				closeOnSelect: false,
+				onSelect: function (p) {trace(p);},
+			},
+			null,
 			{
 				label: "(0) Default Note",
 				keybind: [ZERO],
diff --git a/source/funkin/editors/ui/UIContextMenu.hx b/source/funkin/editors/ui/UIContextMenu.hx
index 8a60a0ff..89132e98 100644
--- a/source/funkin/editors/ui/UIContextMenu.hx
+++ b/source/funkin/editors/ui/UIContextMenu.hx
@@ -1,5 +1,7 @@
 package funkin.editors.ui;
 
+import flixel.util.FlxColor;
+import flixel.util.typeLimit.OneOfTwo;
 import flixel.input.keyboard.FlxKey;
 
 class UIContextMenu extends MusicBeatSubstate {
@@ -55,6 +57,9 @@ class UIContextMenu extends MusicBeatSubstate {
 			lastY = spr.y + spr.bHeight;
 			contextMenuOptions.push(spr);
 			add(spr);
+
+			o.button = spr;
+			if (o.onCreate != null) o.onCreate(spr);
 		}
 
 		var maxW = bg.bWidth - 8;
@@ -86,7 +91,8 @@ class UIContextMenu extends MusicBeatSubstate {
 			option.onSelect(option);
 		if (callback != null)
 			callback(this, index, option);
-		close();
+		if (option.closeOnSelect == null ? true : option.closeOnSelect)
+			close();
 	}
 
 	public override function update(elapsed:Float) {
@@ -115,9 +121,12 @@ typedef UIContextMenuOption = {
 	var ?keybind:Array<FlxKey>;
 	var ?keybinds:Array<Array<FlxKey>>;
 	var ?keybindText:String;
-	var ?color:Int;
+	var ?closeOnSelect:Bool;
+	var ?color:FlxColor;
 	var ?icon:Int;
 	var ?onSelect:UIContextMenuOption->Void;
+	var ?button:UIContextMenuOptionSpr;
+	var ?onCreate:UIContextMenuOptionSpr->Void;
 	var ?childs:Array<UIContextMenuOption>;
 }
 
@@ -172,7 +181,9 @@ class UIContextMenuOptionSpr extends UISliceSprite {
 	}
 
 	public override function draw() {
-		alpha = hovered ? 1 : 0;
+		alpha = option.color == null ? (hovered ? 1 : 0) : 1;
+		if (option.color != null) color = hovered ? option.color.getDarkened(.4) : option.color;
+
 		label.follow(this, 20, 2);
 		if (icon != null)
 			icon.follow(this, 0, 0);