15 commits

Author	SHA1	Message	Date
Mikayla	1693718637	Merge branch 'main' into saving-2	2023-11-16 23:11:38 -08:00
Mikayla	9a3cd073c7	Restore a bunch of random workspace stuff	2023-11-16 23:05:28 -08:00
Conrad Irwin	6d4276ea5f	Merge branch 'main' into collab_ui2	2023-11-16 22:08:42 -07:00
Conrad Irwin	c0ad15756c	More attachment configuration for context menus	2023-11-16 21:59:23 -07:00
Mikayla	4de2c0f7ef	Re-implement actions as derive macros instead of blanket impls	2023-11-16 17:32:02 -08:00
Conrad Irwin	074a221e0f	Progress on ContextMenu	2023-11-16 16:59:27 -07:00
Marshall Bowers	b559bfd80f	Parameterize theme2::init to allow loading just the base theme (#3345) ... This PR adds a parameter to the `theme2::init` method to indicate what the theme-loading behavior should be. This allows us to indicate when we want to load all of the additional built-in user themes (like in the Zed binary and in the storybook), and when we don't want to load the user themes (like in tests). We're using an enum over just a `bool` here for clarity at the call site. Release Notes: - N/A	2023-11-16 13:03:30 -05:00
Kirill Bulatov	ab0a3f19ab	Add an actual context menu into terminal-2 ... (click the text, not the pane!) Co-Authored-By: Piotr <piotr@zed.dev>	2023-11-16 16:36:44 +02:00
Kirill Bulatov	f638d4ce1d	Add basic context menu element	2023-11-16 14:35:13 +02:00
Kirill Bulatov	0f0b7090b8	Fix more errors in terminal element	2023-11-16 13:10:43 +02:00
Kirill Bulatov	fd61683c46	WIP	2023-11-16 10:40:02 +02:00
Kirill Bulatov	e3465fbcf9	Comment out the terminal view	2023-11-16 10:04:20 +02:00
Kirill Bulatov	a238368296	More compilation fixes	2023-11-16 10:04:18 +02:00
Kirill Bulatov	61d6cb880c	Start porting terminal_element to gpui2 ... Co-Authored-By: Mikayla Maki <mikayla@zed.dev>	2023-11-16 10:04:03 +02:00
Kirill Bulatov	d89c51135a	Start porting terminal_view to gpui2 ... Co-Authored-By: Mikayla Maki <mikayla@zed.dev>	2023-11-16 10:04:03 +02:00