From f89a0094cf12ef5cf16eef99f08e6063c46adfe1 Mon Sep 17 00:00:00 2001
From: Matthew <matthew@sleepy.day>
Date: Sun, 11 Jan 2026 15:37:32 +1100
Subject: [PATCH] update before refactoring all the code (again)

---
 assets/gui.frag.spv       | Bin 7376 -> 7316 bytes
 assets/gui.vert.spv       | Bin 9520 -> 9228 bytes
 src/VulkanRenderer        |   2 +-
 src/editor/ui.d           | 210 ++++++++++++++++++++++++++++----------
 src/shaders/gui.layout    |   1 -
 src/shaders/gui.vert.glsl |  24 ++---
 6 files changed, 167 insertions(+), 70 deletions(-)

diff --git a/assets/gui.frag.spv b/assets/gui.frag.spv
index bd666ad8d604f5a2668a4a601bfc72d6240c8f85..fb062574cfef1257a0c7021789fd6a8c9a74404b 100644
GIT binary patch
delta 1104
zcmYjPO=uHA7@bLWlWen_W)rp{S)@WK8fq!27A&O-UPJ^fEh0ss6jMd8Sd2e-N`rV1
z^ial|6ckTAc#s9btF}}R6)T8XTC^JIrHDc4L9F$?Ww&JDvETQ-x8J<^X5RNd?6;zk
zj=0dJND521GuAnMMF>%UKKU{(zk2%;?;<Lmd?tnRl8?GH(F;-nH*N|M6S|*Ake4gh
z$EL1UP>cDssG2czQd4uLyGI9KDPJ6`j89Honeb&$#eH2&t(&flt8FvqB%r%Cez`JH
zX77a08>(n+$Q5O$a<c9fQzO!*za-EK92c6Xs|T%5qNeCoed$YRHJd&v4Yiie+1$7b
ziavaY08Qz3yNr3A_ER~!7sMipJWUCpkPbcrwdv`Bfq>_B)KLE&-zY#mdFJ(?b^y~b
z5Er~sc1OxhRdRCGA1G`B=YgR>@DuTc0JWgjKu#?=6Qg0HUjR4T50Edwh3OAQh~EKs
z3}5Q*pbyP&0p!>}f%7gpMY*LKjw>_DYU`01Z?NrTr1}RmTWi35fWLFgzW}*=Kxp?L
z;#&biyF19KB^TP2uov1T-)uJ$aI_0uYS*s@BBGr9K|GZc`5x(bxARfi{TjMMzzbjy
zF6nI^VErt-a{ddzD_~yD6<jNeMvsxzfCaT&aCP488`UUe^|yXxxUR8;h*?&3yY87~
zM6A&D-C%$p5VP)}9|q{({3+yIq2?1}>N3y_<3i}hM$Gz>nswXrtBCk+P6t=HhM2Wg
z_0jF9CZJ`d2!t1Ephh1p0QqpQ7Q~&Xkq@=WCN25UC!aW1`0p3Qe9hDk!3lk?3o$B4
jG=tYl@*BW|K(yO*7%|ro*yB^DCfsm@1lBgjbQt&#mSmi|

delta 1142
zcmZ8fO-NKx6ux(6-uzFFj-!rm#0iO#60vL{B4JTMF*M|&g@uTY5~x!%R<z0?TC|MQ
zrXWbFRV#Tbx0R7W($A(J3{i(xAx1-qgni%io=5}VoO8bK+;h)8=iTjk+ZA!UT71gT
zDx@MRc_-3ud{Ii3X2xfIdez$NUvPyxQ>mfcSS~-1ofww2pe2t(_xru-Ao4V@t-<#y
zPlb2EzjBqaQHkA%hYOPfmvRMg|IT`BZYVo3nawlTSIIS`7&f(69^l_6vthH%kIX`D
zWO5=~D8SvW8i1c4yjaK%lk-<j2SrD|CHRKXv4Io$!O>&6TpqeYCx$9ndRL#WrW^vQ
zfRkvsB-yIzP^40z16+qxM`MzTX0%@}M~~>B%tY&}y-@Ze`!H+<FyvFTS^KPw=p!9>
zgy#_W`V<mh$#hMu_cNm6)Kqsj8Th=Mb7RITEN8<@sWUFw+yV5<7n)YNW=pqyw`mXT
z2yoMu*Wgn-4`gg^U3SM~=^tRIt^;8Vm&JYpyl@{t-9#th%J7sb+uBiB=J5uO{ufY|
zV*F4Oy$w7s4g1@+WmINXOy0%Yb<EOrr(Jqe(hc=D{(#;DZUathTkx;hDBA6E9L%NW
zH0lE9G)jGEqi$Pcqs(&}#aFDTvA$n<WTl~18xl#h>pH6^;nr<0Aanv;QV+(>iOd1y
z&!HKv;U(}4n3M5F^LQ=FJw#Lls5}Kwy0XAi@cHY-NiKFCVD%>etFzi`U|!xdnt=s7
zs+ILdv*|q|GJN7KoaY2T0OaeW)ij$v+Dr@`oW+J%tp+~%1sOD(6N~WpF`cn@`xQR9
zMY(6Tqyxw$(+W5n4ua#2L4dk*a|r$(@~}>Bct>tX0!g!L2^svDsbp{`J6Z;o{sY%a
TZ3SS*%W@%EZ<NT$^`!Y1g6ywI

diff --git a/assets/gui.vert.spv b/assets/gui.vert.spv
index 25c67fbdbe4139e2cbbb98314f492cc7f7f1c009..3955c64c49668e820f363ed144e3fd29509dc7ff 100644
GIT binary patch
delta 2218
zcmY*ZZA_b06u$Q@Eu~Os_u`;Hzn}{?3@3scI2dD_8~f7D;6D=}(6L5BorT5dk7|sG
zKXi_qn8n1!EYU=N7^jVi#;?qexXf)j4VzQ5Fr2z&EDI_UW0*cqdG9iB^5mT7eBN{V
z-X7idT(93{H54niR;9|XN+<nYdimt`p5Ql1sdK<3;8$Q_^2k=bWAf??73s0q{?t%g
zES4VYAIgl%L0v6V`VQ-^q<E|*t2HTYR?=!q$^h8iNjYF8J*$(5j>(+ATFzRwwI(UE
z)=H~ADYdQ@x+A~A<#Ol8ycL$qrKa;w`%YUj<bPAEd`0<>x~WJV#RW7lv0o{Vau>J-
zKAauze<YKI%~P<sq&ZL(E^<732S@kxXVZ_Tz&)zC5aE`=K&|%3WQ8pU1Kv<EeA&#N
z@v&4k3-xAoue=?wb&0eDLvkTdhCAfpU7A?o1|G!)rG`gR{kNpM(d8U+YW0ll3|4i_
zuq4jj!EFC{>ap>OM^ngk6_&br(`M-I!gBxb_o#U}9IOh>FD0vy(f(bTY<fJM87s^&
zFQ?F9Uakad!;EnOh}k$XI=U&H9UmMUTI#Zpk1uP~aV~0$DpK8$5y0#4dmZkQv>lDR
z9qYr6l}lvSOAgoahTWLs(5%6=(aSG{+*9C7gOxizemV5<FqU5tc}ao06tB*^^<oKT
z)KYLBW8;rb8zpQOHZxdh>-qdd<zZKGS>Y#*O1#>ZJFEM0F?9I|kz5G7G=VRN`~+Yp
z!#{=27{kAS&Up<#4xJOR-U&!f%dL^0f@ChaiT@fpV#?K81ayFKO<IB>J7+@9!on+=
z2riC88UGK^`4dD?d<N17u-(s)Y)2b&$+=kC=>G+hbr?@SITuYE{5f?Q3WH6-tI&Co
z7*L0VKOs3wClJBZ{3W7}jXr{n{(@v3`q_wl!Le}&)+k|DrMg#Q6!!3Gd&x+L7eVyL
z<iVP59g`PpR)s4Wj<XJ>`PtkCn7DemSo4Zb$Wyh4^a=^pWp$%GUpM6U-BRmzS*&Z)
zKAEetr87J%vk|Yn9v;>$;*V^RvPeLNBkj6X4o4c~<%myCMC$b_xfZF_YosLFD&A;7
zc0?1>3Hf9+q3@B`qOE$ZoR2nzSMy>xyxSqjR{?XkE{VtP*Xv|oY)G${saSWehoLw<
z7=1hBdq55t0J<<a*YQ3;d&c1(KyL+}b=LJEbjHxmI{cJB2HpV@0B=IhICGN?&~fg&
znQ#n@3H;`nKt2MPgpJU7OoPv%GoEjP@#GK5v3OO8?Y{)*<qM&gyiexhRb6}+Ujbar
z0Kg&n4V(mMXMMhv(*P?R2Uvmpq{Qp(W|MIS7Cso0@hx;_@KrH`{EY0bugbCB6hQBH
z0KMev0W)7ObRJXvd+2;@ruup4%;$q-J~?Ad{#NKb2b>?}C+Keh4=5#1G?e5nK&OqL
z?lVrzG<4eg0JGPN(AkF%n|;Wq0n=w2bROQ5Z}T^R5109uA+G?JfEIxH<cN{a8iLJ?
z;X9rM8UV(yP7LxIK>KdQ@b|bbJqbHJ2W<q<z%Kk(@rC~mTnFZ4U&7A)0gbt|nmg`<
z&SPr*4V`g3#`X_%+F04x79E=fX}aBj&V0tx9|SnZyO94XwXE=GVupo5-4LCyy^AQ^
G4*Un_H(3k-

delta 2400
zcmY*ZZA@H66n*m^yHLuOg{7|BWxop8uC(G7utkbUMLw*Fw5i6#CM#LClt5Tvm&QMa
zG{&SqS`E1-Y9cZIG%?z`X>3i6rH#hMQtL-GwxHG2e%dH8Xel9j&fE70JaTsKIrq-J
zGk0b<*m3v?m!VhWYYwHY)LdHen5#*7$F{eu{#etr?}1Ceb>Jp2KQ`W}_KaP7%^mI=
z4DU-O>cTMMiPV5hEC0Q*DCsgio*e9Hl%b+BV^cINZ>t)k7UQI<HtI0mRZ*iJW0hWQ
zJcMzl9yK;&d`Yh{wqX1~-(WOgoYJfG*n?T!FdWf%I@3LzX)IjP*7^Vnr-oS~Y<*4E
za;Rk;1;x4(t2VSNS#RMvy$GvaoFTsyWwWolE~@98+F=AKV9^QNspXlv4tr!Dxx?fJ
zcuzVLe<78ImYbVrX^G@uCOOR5d^6S|M~eN*DU<lkmm9_YjRlBIr}kt9lj$_f#jGn}
z4|n&alReZ5%-Mw!b62%HwJdzOCg--!c@F&XfGi!mrRFpbEZNhWj4vtTz-lhZez#v;
zm2tPX;VKj0+uNOvXOb^wMuwA^YnX@J*4k#~=3y`QJGD8v?e_ZS%(<G@I}q<mrTa2{
zsX=qUa}p@=t2t>X@dp^gJ|X6@k%58MJ{;L#B3ETTJ5;hxMd)rvi<>b90XBgAaf|24
z@zPL)r$@ElQXLk5%i_Asm986QBbb9n$Y|bLayFZsH<&!%<hhNmvV6SR^zmaXH%?w?
zazo=*cm+Dp7JKU}!TDKQsacpJ7hsC=uE(S1vPV7RM!w5D%#b|o?H_GKg*Oqz6*IUR
z{2q*-0IU)QpTNlOup_qrw58en3vgaKo1cNr-q`#sZ0?r%&RI6PF=`6mKwts3$DZ(=
z#ks%+*leL%;{Or$(gj@vXN&B3ws>j$&)__~AS&^`F*dA?=4sbpusB6dCg&MY<7#hU
zWFk8``Atis{}0%V%_Yp!{)Ekig@JPT?_lJ{wgN#cfoB%7v^%?CFo22fVq_u)a3SRL
zmd36yiHj@IwB`+HE{m)Jr$!VYhVF<A`I=Qkj`(WSYWdaYR~540dq?X0Zh3#r0d=3$
z`_pQ@yys82INzQZ6<>MvGUa~RQQj}>18zB6zFTdQXrNuy%21$PrUHd>DzHY?%XFYx
zPLvmjJ6I;q2HjE@tdxTo_XaD~!*VECs~TkjzguNCSgkfoB;=Qap#o_Qb*N@J6iTQT
znF%%5Z{xo3HDMQQ&oO|PvIRRmit#w`5l{&{f<BQSlgY5xu^rY4X$gBeKcxkvkb~X%
z45$STSlv1an=#axcLL)nfO&c0nV0;eEQGy2dOru~Jq^%H-YXj;Iq#R2mzSSj^4+pO
z;tAN<zp^6ESP|sAWFq2i;v@JPcmsGI;J$gn=K<=>z<2R2z!mTTu?G2hnThzTF2Lfe
zup@tf%}Bl+Mv`BU*xKA`nCmBi5qvw0Ab(WG*Lp`;c?#gGvGYyCW;9<GqsbX#-xv0s
z->X)4FT?&2*a^IBX}`g~43q({SlSiX)Oq)<K0TxT4#Hx5rYuIzK)cwJu=%k~d}+4;
zzCtG83%m_n2Vwx{li!k=3Qr3o_$L1XDgZ_>OBmw}Kz#>d*n+=-UVxvi%}T7oGx`q{
zdS`)cKnXC0S-h(M0?fo1d%aJ==4WSFfXz65w)P)vYIuW-ngXGw16}x!$^5#~IyENX
g1O~7;x5am1fb+jZ4B*DeF=25bUC{Y0pv)HFe|h?g=>Px#

diff --git a/src/VulkanRenderer b/src/VulkanRenderer
index c2b7544..3390ee9 160000
--- a/src/VulkanRenderer
+++ b/src/VulkanRenderer
@@ -1 +1 @@
-Subproject commit c2b7544979b16e1f27f419475b866a2903bd9c0a
+Subproject commit 3390ee9742fbce758941a0dd216ebec5c75876e5
diff --git a/src/editor/ui.d b/src/editor/ui.d
index 66ed5ee..5b36c80 100644
--- a/src/editor/ui.d
+++ b/src/editor/ui.d
@@ -332,6 +332,20 @@ struct UICtx
 	debug u64                   item_count;
 }
 
+struct ItemStyle
+{
+	Vec4    bg_col;
+	Vec4    bg_hl_col;
+	Vec4    border_col;
+	Vec4    border_hl_col;
+	Vec4    text_col;
+	Vec4    text_hl_col;
+	Vec2[2] padding;
+	Vec4    corner_radius;
+	f32     border_thickness;
+	f32     edge_softness;
+}
+
 enum UIElement
 {
 	Default,
@@ -353,20 +367,31 @@ enum UIElement
 	StatusMessage,
 	Max,
 }
-
 alias UIElem = UIElement;
 
-struct ItemStyle
+enum Element
 {
-	Vec4    bg_col;
-	Vec4    bg_col_end;
-	Vec4    bg_hl_col;
-	Vec4    border_col;
-	Vec4    border_hl_col;
-	Vec4    text_col;
-	Vec4    text_hl_col;
-	Vec2[2] padding;
+	Panel,
+	PanelFocus,
+	Window,
+	WindowFocus,
+	Border,
+	BorderFocus,
+	Text,
+	Button,
+	ButtonAlt,   // Alternating option colours
+	ButtonFocus,
+	Max,
+} alias Elem = Element;
+
+struct UIStyle
+{
+	enum N = Elem.max;
+
+	Vec4[N] cols;
 	Vec4    corner_radius;
+	Vec2[2]	text_box_padding;
+	Vec2[2] button_padding;
 	f32     border_thickness;
 	f32     edge_softness;
 }
@@ -376,7 +401,6 @@ DefaultItemStyle()
 {
 	ItemStyle style = {
 		bg_col: BG_COL,
-		bg_col_end: BG_COL,
 		bg_hl_col:  BG_HL_COL,
 		border_col: BORDER_COL,
 		border_hl_col: BORDER_HL_COL,
@@ -480,6 +504,8 @@ enum SizeType
 	Percentage,
 	ChildrenSum,
 	TextSize,
+	Pct = ST.Percentage,
+	Px  = ST.Pixels,
 }
 
 alias ST = SizeType;
@@ -488,7 +514,6 @@ struct UISize
 {
 	SizeType type;
 	f32      value;
-	f32      strictness = 1.0;
 }
 
 struct UIBuffer
@@ -510,7 +535,6 @@ struct VPos
 struct Vertex
 {
 	Vec4    cols;
-	Vec4    cols_end;
 	Vec4    corner_radius;
 	union
 	{
@@ -537,18 +561,17 @@ enum SettingType
 	Toggle,
 }
 
-Attribute[11] attributes = [
-	{ binding: 0, location: 0,  format: FMT.RGBA_F32, offset: Vertex.cols.offsetof             },
-	{ binding: 0, location: 1,  format: FMT.RGBA_F32, offset: Vertex.cols_end.offsetof         },
-	{ binding: 0, location: 2,  format: FMT.RGBA_F32, offset: Vertex.corner_radius.offsetof    },
-	{ binding: 0, location: 3,  format: FMT.RG_F32,   offset: Vertex.dst_start.offsetof        },
-	{ binding: 0, location: 4,  format: FMT.RG_F32,   offset: Vertex.dst_end.offsetof          },
-	{ binding: 0, location: 5,  format: FMT.RG_F32,   offset: Vertex.src_start.offsetof        },
-	{ binding: 0, location: 6,  format: FMT.RG_F32,   offset: Vertex.src_end.offsetof          },
-	{ binding: 0, location: 7,  format: FMT.R_F32,    offset: Vertex.border_thickness.offsetof },
-	{ binding: 0, location: 8,  format: FMT.R_F32,    offset: Vertex.edge_softness.offsetof    },
-	{ binding: 0, location: 9,  format: FMT.R_F32,    offset: Vertex.raised.offsetof           },
-	{ binding: 0, location: 10, format: FMT.R_U32,    offset: Vertex.has_texture.offsetof      },
+Attribute[10] attributes = [
+	{ binding: 0, location: 0, format: FMT.RGBA_F32, offset: Vertex.cols.offsetof             },
+	{ binding: 0, location: 1, format: FMT.RGBA_F32, offset: Vertex.corner_radius.offsetof    },
+	{ binding: 0, location: 2, format: FMT.RG_F32,   offset: Vertex.dst_start.offsetof        },
+	{ binding: 0, location: 3, format: FMT.RG_F32,   offset: Vertex.dst_end.offsetof          },
+	{ binding: 0, location: 4, format: FMT.RG_F32,   offset: Vertex.src_start.offsetof        },
+	{ binding: 0, location: 5, format: FMT.RG_F32,   offset: Vertex.src_end.offsetof          },
+	{ binding: 0, location: 6, format: FMT.R_F32,    offset: Vertex.border_thickness.offsetof },
+	{ binding: 0, location: 7, format: FMT.R_F32,    offset: Vertex.edge_softness.offsetof    },
+	{ binding: 0, location: 8, format: FMT.R_F32,    offset: Vertex.raised.offsetof           },
+	{ binding: 0, location: 9, format: FMT.R_U32,    offset: Vertex.has_texture.offsetof      },
 ];
 
 union Rect
@@ -568,7 +591,103 @@ struct UIKey
 }
 
 enum bool KeyType(T)        = (StringType!(T) || is(T == UIKey) || is(T == const(UIKey)));
-enum bool ItemAndKeyType(T) = (KeyType!(T) || is(T == UIItem*));
+enum bool ItemAndKeyType(T) = (KeyType!(T)    || is(T == UIItem*));
+
+// ******
+// Public
+// ******
+
+void
+BeginContainer(ST x_t = ST.Pct, ST y_t = ST.Pct)(Axis2D axis, f32 w, f32 h)
+{
+	PushSizeInfo(UIS2(x_t, y_t, w, h));
+	PushAxisLayout(axis);
+	UIItem* item = MakeItem(ZeroKey());
+	PushParent(item);
+}
+
+alias EndContainer = Pop!("parent");
+
+enum WindowFlags
+{
+	None         = 0<<0,
+	NoBorder     = 1<<0,
+	NoBackground = 1<<1,
+	NoDropShadow = 1<<2,
+	Draggable    = 1<<3,
+	NoTitleBar   = 1<<4,
+} alias WinF = WindowFlags;
+
+UIFlags
+GetFlags(WinF flags)()
+{
+	UIFlags flags = UIF.DrawBackground|UIF.DrawBorder|UIF.DrawDropShadow|UIF.AnimateReady|UIF.Window;
+	static if(flags & WinF.NoBorder)
+	{
+		flags &= ~UIF.DrawBorder;
+	}
+	static if(flags & WinF.NoBackground)
+	{
+		flags &= ~UIF.DrawBackground;
+	}
+	static if(flags & WinF.NoDropShadow)
+	{
+		flags &= ~UIF.DrawDropShadow;
+	}
+	static if(flags & WinF.Draggable)
+	{
+		flags &= ~UIF.Window;
+		flags |=  UIF.FloatingWindow;
+	}
+
+	return flags;
+}
+
+// Converts to parameters (string label, Args args, Axis2D axis, f32 x, f32 y, f32 w, f32 h)
+void
+BeginWindow(WinF flags = WinF.None, ST x_t = ST.Px, ST x_y = ST.Px, Args...)(string label, Args args)
+{
+	enum len = Args.length;
+
+	static assert(is(typeof(Args[len-1]) == f32));
+	static assert(is(typeof(Args[len-2]) == f32));
+	static assert(is(typeof(Args[len-3]) == f32));
+	static assert(is(typeof(Args[len-4]) == f32));
+	static assert(is(typeof(Args[len-5]) == Axis2D));
+
+	string scratch = Scratchf!(Args[0 .. len-5])(label, args[0 .. len-5]);
+
+	BeginWindow!(flags, x_t, x_y)(scratch, args[len-5], args[len-4], args[len-3], args[len-2], args[len-1]);
+}
+
+void
+BeginWindow(WinF flags = WinF.None, ST x_t = ST.Px, ST x_y = ST.Px)(string label, Axis2D axis, f32 x, f32 y, f32 w, f32 h)
+{
+	PushFixedPos(Vec2(x, y));
+	PushSizeInfo(UIS2(x_t, y_t, w, h));
+	PushAxisLayout(axis);
+	UIFlags flags = GetFlags!(flags);
+
+	static assert((flags & WinF.Draggable) == 0 || (flags & ~WinF.NoTitleBar) == flags, "Unable to use NoTitleBar flag with the Draggable flag");
+
+	UIItem* window = MakeItem("###window_%s", label, flags);
+
+	static if(flags & WinF.Draggable)
+	{
+		//UIItem* header
+	}
+}
+
+void
+EndWindow()
+{
+	UIItem* window = Pop!("parent");
+
+}
+
+// ********
+// Internal
+// ********
 
 void
 InitUICtx(PlatformWindow* window)
@@ -1382,6 +1501,8 @@ EndUI()
 
 		BeginRendering(&ctx.rd);
 
+		SetStencilTest(&ctx.rd, false);
+
 		Vec2 ext = GetExtent();
 		if(ext != ctx.res)
 		{
@@ -1521,22 +1642,6 @@ EndUI()
 				if(children_size > size)
 				{
 					f32 excess = children_size - size;
-					for(UIItem* c = item.last; !Nil(c); c = c.prev)
-					{
-						if(c.flags & (UIF.FixedPosition | (UIF.OverflowX<<axis)))
-						{
-							continue;
-						}
-
-						f32 leniency = c.size.v[axis] - c.size.v[axis]*c.size_info[axis].strictness;
-						f32 reduced  = Min(excess, leniency);
-
-						excess         -= reduced;
-						c.size.v[axis] -= reduced;
-
-						if(excess <= 0.0009) break;
-					}
-
 					if(excess > 0.0009)
 					{
 						for(UIItem* c = item.last; !Nil(c); c = c.prev)
@@ -1816,7 +1921,6 @@ RenderItem(UICtx* ctx, UIItem* item)
 		v.dst_start     = border_p0 - Vec2(px);
 		v.dst_end       = border_p1 + Vec2(px);
 		v.cols          = Vec4(0.0, 0.0, 0.0, alpha);
-		v.cols_end      = Vec4(0.0, 0.0, 0.0, alpha);
 		v.corner_radius = 0.8f;
 		v.edge_softness = 8.0f;
 
@@ -1826,15 +1930,13 @@ RenderItem(UICtx* ctx, UIItem* item)
 	if(item.flags & UIF.DrawBackground)
 	{
 		Vec4 bg_col     = style.bg_col;
-		Vec4 bg_col_end = style.bg_col_end;
-		AnimateHot(item, BG_HL_COL, &bg_col, &bg_col_end);
-		AnimateReady(item, &bg_col, &bg_col_end);
+		AnimateHot(item, BG_HL_COL, &bg_col);
+		AnimateReady(item, &bg_col);
 
 		Vertex* v       = GetVertex(ctx);
 		v.dst_start     = item.rect.p0;
 		v.dst_end       = item.rect.p1;
 		v.cols          = bg_col;
-		v.cols_end      = item.flags & UIF.Gradient   ? bg_col_end        : bg_col;
 		v.corner_radius = item.flags & UIF.DrawBorder ? style.corner_radius*0.5 : style.corner_radius;
 		v.edge_softness = style.edge_softness;
 
@@ -1851,7 +1953,6 @@ RenderItem(UICtx* ctx, UIItem* item)
 		v.dst_start        = border_p0;
 		v.dst_end          = border_p1;
 		v.cols             = style.border_col;
-		v.cols_end         = style.border_col;
 		v.corner_radius    = style.corner_radius;
 		v.border_thickness = style.border_thickness;
 		v.edge_softness    = style.edge_softness;
@@ -2509,7 +2610,6 @@ DrawGlyph(UIItem* item, Glyph* glyph, f32* x_pos, f32 y, f32 line_height, Vec4 c
 			v.dst_start   = Vec2(*x_pos+glyph.plane_left,   y_pos);
 			v.dst_end     = Vec2(*x_pos+glyph.plane_left+w, y_pos+h);
 			v.cols        = col;
-			v.cols_end    = col;
 			v.src_start   = Vec2(glyph.atlas_left,  glyph.atlas_top);
 			v.src_end     =	Vec2(glyph.atlas_right, glyph.atlas_bottom);
 			v.has_texture = true;
@@ -2579,21 +2679,21 @@ GetVertex(UICtx* ctx)
 }
 
 static UISize[2]
-UIS2(SizeType t0 = ST.Percentage, SizeType t1 = ST.Percentage, f32 v0 = 1.0, f32 v1 = 1.0, f32 s0 = 1.0, f32 s1 = 1.0)
+UIS2(SizeType t0 = ST.Percentage, SizeType t1 = ST.Percentage, f32 v0 = 1.0, f32 v1 = 1.0)
 {
-	return [UISize(t0, v0, s0), UISize(t1, v1, s1)];
+	return [UISize(t0, v0), UISize(t1, v1)];
 }
 
 static UISize[2]
-UISX(SizeType type, f32 value = 1.0, f32 strictness = 1.0)
+UISX(SizeType type, f32 value = 1.0)
 {
-	return [UISize(type, value, strictness), UISize(ST.Percentage, 1.0)];
+	return [UISize(type, value), UISize(ST.Percentage, 1.0)];
 }
 
 static UISize[2]
-UISY(SizeType type, f32 value = 1.0, f32 strictness = 1.0)
+UISY(SizeType type, f32 value = 1.0)
 {
-	return [UISize(ST.Percentage, 1.0), UISize(type, value, strictness)];
+	return [UISize(ST.Percentage, 1.0), UISize(type, value)];
 }
 
 bool
diff --git a/src/shaders/gui.layout b/src/shaders/gui.layout
index 6e464eb..1691df7 100644
--- a/src/shaders/gui.layout
+++ b/src/shaders/gui.layout
@@ -29,7 +29,6 @@ layout (location = 0) FragDataFlat
 layout (location = 1) FragData
 {
 	vec4  color;
-	vec4  color_end;
 	vec2  uv;
 	vec2  dst_pos;
 	vec2  dst_center;
diff --git a/src/shaders/gui.vert.glsl b/src/shaders/gui.vert.glsl
index 9911138..87f37ab 100644
--- a/src/shaders/gui.vert.glsl
+++ b/src/shaders/gui.vert.glsl
@@ -6,17 +6,16 @@
 
 #include "gui.layout"
 
-layout (location = 0)  in vec4  in_col_start;
-layout (location = 1)  in vec4  in_col_end;
-layout (location = 2)  in vec4  in_corner_radius;
-layout (location = 3)  in vec2  in_dst_start;
-layout (location = 4)  in vec2  in_dst_end;
-layout (location = 5)  in vec2  in_src_start;
-layout (location = 6)  in vec2  in_src_end;
-layout (location = 7)  in float border_thickness;
-layout (location = 8)  in float edge_softness;
-layout (location = 9)  in float raised;
-layout (location = 10) in uint  has_texture; 
+layout (location = 0) in vec4  in_col;
+layout (location = 1) in vec4  in_corner_radius;
+layout (location = 2) in vec2  in_dst_start;
+layout (location = 3) in vec2  in_dst_end;
+layout (location = 4) in vec2  in_src_start;
+layout (location = 5) in vec2  in_src_end;
+layout (location = 6) in float border_thickness;
+layout (location = 7) in float edge_softness;
+layout (location = 8) in float raised;
+layout (location = 9) in uint  has_texture; 
 
 vec2 Vertices[4] = vec2[4](
 	vec2(-1.0, -1.0),
@@ -62,8 +61,7 @@ void main()
 	vec2 dst_verts_pct = vec2(bool(gl_VertexIndex >> 1) ? 1.0f : 0.0f, 
 													  bool(gl_VertexIndex &  1) ? 0.0f : 1.0f);
 
-	FD.color            = in_col_start;
-	FD.color_end        = in_col_end;
+	FD.color            = in_col;
 	FD.uv               = uvs[gl_VertexIndex] / tex_size;
 	FD.dst_pos          = pos;
 	FD.dst_center       = center;