18 commits

Author	SHA1	Message	Date
Nate Butler	453aa5ffd7	TextColor -> Color	2023-11-21 01:05:29 -05:00
Conrad Irwin	3e2dba36b4	Merge branch 'main' into callback-handles	2023-11-20 16:28:35 -07:00
Mikayla	2c4d83c9af	WIP ... co-authored-by: conrad <conrad@zed.dev> co-authored-by: Nathan <nathan@zed.dev>	2023-11-20 14:46:01 -08:00
Max Brunsfeld	4f4ef4a357	More fixes for zed nightly (#3370) ... When running `script/bundle` with the new `-2` flag, we needed to adjust the fat-binary creation step to look for the binary called `Zed2`. We also fixed a source of intermittent build failures in `script/bundle` due to running multiple `swift build` processes concurrently for the `live_kit_client2` crate, building for the two architectures. Release Notes: NA	2023-11-20 12:36:25 -08:00
Max Brunsfeld	babd41916a	Remove gpui (1) dependencies from zed2 ... Co-authored-by: Mikayla <mikayla@zed.dev>	2023-11-20 10:46:16 -08:00
Conrad Irwin	0798cfd58c	Merge branch 'main' into derive-element-redux	2023-11-20 09:15:38 -07:00
Nathan Sobo	33cd6f520a	Clean compile with redesigned element traits	2023-11-18 21:51:47 -07:00
Nathan Sobo	adc355a1e6	Element refinement passing on ui2	2023-11-18 20:05:47 -07:00
Kirill Bulatov	d352a63d9d	Port new workspace logic to gpui2, uncomment most of the workspace2 tests	2023-11-17 22:54:19 +02:00
Mikayla	9a3cd073c7	Restore a bunch of random workspace stuff	2023-11-16 23:05:28 -08:00
Mikayla Maki	61bd6bab09	Actions‽ (#3349) ... This PR re-implements our actions with macros instead of a blanket impl. Release Notes: - N/A	2023-11-16 18:18:04 -08:00
Mikayla	4de2c0f7ef	Re-implement actions as derive macros instead of blanket impls	2023-11-16 17:32:02 -08:00
Nate Butler	c2d6d24952	Ensure the titlebar stays large enough even with small ui sizes	2023-11-16 16:01:42 -05:00
Mikayla	9da0b78ead	Merge branch 'main' into tabs-n-splits	2023-11-15 23:41:25 -08:00
Conrad Irwin	0a9fb3978b	Enable panel switching	2023-11-15 21:01:00 -07:00
Conrad Irwin	7f70712dac	Uncomment enough to register the panel	2023-11-15 16:44:21 -07:00
Conrad Irwin	793fa6e3a4	Move placeholder titlebar render to collab_ui	2023-11-15 16:09:21 -07:00
Conrad Irwin	84bcbf1128	Add collab_ui2	2023-11-15 16:08:03 -07:00