166 commits

Author	SHA1	Message	Date
Conrad Irwin	4540f04dbe	Add more detail to panel switcher interaction	2023-11-16 09:57:59 -07:00
Kirill Bulatov	fd61683c46	WIP	2023-11-16 10:40:02 +02:00
Kirill Bulatov	a238368296	More compilation fixes	2023-11-16 10:04:18 +02:00
Mikayla	9da0b78ead	Merge branch 'main' into tabs-n-splits	2023-11-15 23:41:25 -08:00
Mikayla	c70c0f9ae9	Remove initialize_workspace	2023-11-15 23:11:31 -08:00
Conrad Irwin	0a9fb3978b	Enable panel switching	2023-11-15 21:01:00 -07:00
Mikayla	78cea69172	Add focusable view and restore workspace deserialization. Partially restore split and tab functions	2023-11-15 16:36:43 -08:00
Mikayla	e905ababcd	Add back splitting	2023-11-15 15:21:19 -08:00
Conrad Irwin	793fa6e3a4	Move placeholder titlebar render to collab_ui	2023-11-15 16:09:21 -07:00
Mikayla	faf93aed4e	checkpoint	2023-11-15 14:17:04 -08:00
Conrad Irwin	cebc8428c8	FileFinder tests	2023-11-15 13:16:28 -07:00
Mikayla	7f72df6dcf	Merge branch 'main' into element-types	2023-11-14 15:49:10 -08:00
Mikayla Maki	df64a3c701	Not working yet file-finder2 (#3321) ... Porting file_finder Release Notes: - N/A	2023-11-14 15:22:59 -08:00
Conrad Irwin	1109cd11c8	Abandon ship	2023-11-14 16:17:24 -07:00
Mikayla	6b25841e2a	WIP	2023-11-14 14:48:34 -08:00
Nate Butler	008655b879	Set Pane Size	2023-11-14 16:47:52 -05:00
Conrad Irwin	3b01a032ba	In the middle of stuff	2023-11-14 14:38:23 -07:00
Conrad Irwin	80b7f75d24	Merge branch 'main' into file_finder	2023-11-14 13:34:25 -07:00
Conrad Irwin	3a4c5aa440	Implement FileFinder	2023-11-14 13:34:14 -07:00
Conrad Irwin	37d0b8424c	Merge branch 'main' into element-types	2023-11-14 12:10:26 -07:00
Marshall Bowers	5c8db996ee	Extend Label & Tooltip (#3322) ... This PR extends the `Label` component with additional functionality, partially for use in the `TextTooltip` component. - [x] `Label` should take a `size` (`Default` & `Small` for now) - These should use `text_ui` and `text_ui_sm` - [x] Fold `LabelColor` and `IconColor` into one enum - `TextColor` - [x] `TextTooltip`'s keybinding field should take whatever we use for keybindings instead of a string, and render the keybinding component - [x] `TextTooltip` should use small `Label`s Release Notes: - N/A	2023-11-14 13:56:05 -05:00
Marshall Bowers	76c15229c1	Combine LabelColor and IconColor into TextColor	2023-11-14 13:48:01 -05:00
Conrad Irwin	5dda105182	Merge branch 'main' into element-types	2023-11-14 11:45:19 -07:00
Marshall Bowers	90d7033fd0	Pass KeyBindings to TextTooltips	2023-11-14 13:36:03 -05:00
Marshall Bowers	aa1471948f	Merge branch 'main' into extend-label-and-tooltip	2023-11-14 13:14:10 -05:00
Mikayla	caa0bae04f	Merge branch 'main' into core-actions	2023-11-14 10:11:39 -08:00
Nate Butler	251b4640c6	Extend tooltip to take meta + kb	2023-11-14 12:59:53 -05:00
Max Brunsfeld	c7d80c7aac	Start work on creating gpui2 version of project panel (#3299) ... I'm gonna land what I have, even though some features aren't ported yet, since we're working on all of this code so actively. * [x] get the basic structure compiling * [x] get the panel laying out correctly * [ ] rename / new file editor * [ ] enable the tests * [ ] drag and drop * [ ] context menu	2023-11-14 09:56:46 -08:00
Max Brunsfeld	b893ac2a02	Merge branch 'main' into project-panel2	2023-11-14 09:33:48 -08:00
Conrad Irwin	7d94d8940c	Not working yet file-finder2	2023-11-14 09:28:18 -07:00
Antonio Scandurra	40c634e056	Merge remote-tracking branch 'origin/main' into editor2-blocks	2023-11-14 17:16:58 +01:00
Antonio Scandurra	d855e91e43	Honor cmd-w to close active item ... Co-Authored-By: Julia <julia@zed.dev>	2023-11-14 16:38:20 +01:00
Nate Butler	6b366c102e	Allow a button to take a color (#3315) ... [[PR Description]] - Allows a button to take a color and resolve it into `IconColor` and `LabelColor` - Extend `IconColor` and `LabelColor` to allow them to take a `Player(i)` - `impl From<LabelColor> for IconColor` Release Notes: - N/A	2023-11-14 10:36:52 -05:00
Nathan Sobo	6abaacc457	Fix formatting	2023-11-14 01:58:10 -07:00
Nathan Sobo	364e3e7de5	Merge remote-tracking branch 'origin/main' into element-types	2023-11-14 01:55:58 -07:00
Nathan Sobo	c6e8a097a3	Rename back to div	2023-11-14 01:41:55 -07:00
Nathan Sobo	80014a28ea	No compile errors or warnings	2023-11-14 01:23:09 -07:00
Nathan Sobo	27fb381cca	Checkpoint	2023-11-14 01:15:48 -07:00
Mikayla	ee4957dd47	Implement most core actions	2023-11-14 00:06:33 -08:00
Mikayla	ec16e70336	Sketch in core zed actions code	2023-11-13 22:13:07 -08:00
Conrad Irwin	ad017a5df5	Allow clicking on commands in the command palette	2023-11-13 21:42:27 -07:00
Nate Butler	38888696db	Allow a button to take a color	2023-11-13 19:46:15 -05:00
Mikayla	7d1593b90c	Merge branch 'main' into editor-tests	2023-11-13 15:53:22 -08:00
Mikayla	a4e9fea133	WIP ... co-authored-by: conrad <conrad.irwin@zed.dev>	2023-11-13 15:53:04 -08:00
Marshall Bowers	92f2e8eb34	Combine related conditions	2023-11-13 18:22:04 -05:00
Marshall Bowers	53117eb5e5	Merge branch 'main' into one-themes	2023-11-13 18:16:45 -05:00
Nate Butler	701f954448	Start refining tab	2023-11-13 17:51:58 -05:00
Max Brunsfeld	2eedd2ad03	Merge branch 'main' into project-panel2	2023-11-13 13:39:13 -08:00
Conrad Irwin	f464d69ff8	Merge branch 'main' into dispatch-tree	2023-11-13 13:21:57 -07:00
Mikayla	0e3fd92bd0	Get editor tests compiling	2023-11-13 12:10:14 -08:00