Commit Graph
448 Commits
Author SHA1 Message Date
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
Piotr OsiewiczandNate c14efb74d7 Finish up touchups for search UI.
Co-authored-by: Nate <nate@zed.dev>
2023-11-14 18:18:52 +01:00
Piotr OsiewiczandNate 08dde94299 WIP styling
Co-authored-by: Nate <nate@zed.dev>
2023-11-14 17:59:53 +01: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
Piotr Osiewicz 6c69e40e5c WIP 2023-11-14 16:56:31 +01:00
Antonio ScandurraandJulia 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
Mikaylaandconrad 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
Piotr Osiewicz dfd68d4cb8 WIP: start search2 2023-11-13 20:38:37 +01:00
Max Brunsfeld 1968becf94 Merge branch 'main' into project-panel2 2023-11-13 11:26:51 -08:00
13dd912817 Get left, right, and bottom docks rendering in the right places in the workspace
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-13 10:47:15 -08:00
Antonio Scandurra 44534b926d Register actions on the right div 2023-11-13 15:21:47 +01:00
Kirill Bulatov a9c17e7407 Uncomment all inlay hint cache code and tests 2023-11-13 14:07:48 +02:00
Mikayla 13255ef133 Poke at getting the project panel showing up 2023-11-12 23:22:02 -08:00
Nathan Sobo 7eaba8fabc WIP 2023-11-10 14:47:45 -07:00
Nathan SoboandAntonio Scandurra 74a0d9316a Add a DispatchTree which will replace the existing key dispatch strategy
Instead of freezing a stack, we will record the entire dispatch tree so we can
change focus.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-11-10 11:56:14 -07:00
Conrad Irwin cc9fb9dea0 Fix panic caused by focusing the same thing twice 2023-11-09 22:25:46 -07:00
Conrad Irwin 5a711886d4 Refactor to make ModalLayer a View 2023-11-09 22:15:44 -07:00
Conrad Irwin d4b1d1b528 Move from register_modals to register_workspace_action 2023-11-09 21:51:48 -07:00
Conrad Irwin e6d6806693 Tidy up some more modal behaviour 2023-11-09 21:11:44 -07:00
Conrad Irwin 77d92ff65a Tidy up 2023-11-09 20:58:35 -07:00
Max Brunsfeld b9e098ead8 Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00
Piotr OsiewiczandConrad 194d615691 Fix up keybindings propagation
Co-authored-by: Conrad <conrad@zed.dev>
2023-11-09 18:33:36 +01:00
Piotr Osiewicz d184e0d426 Start working on command_palette2 2023-11-09 17:54:05 +01:00
Mikayla 2c67cc80ba Merge branch 'main' into event-emitter 2023-11-08 20:10:38 -08:00
Mikayla a97c8bf58f Get workspace compiling with new event emitters 2023-11-08 19:29:00 -08:00
Conrad Irwin b90e34aeb2 go to line2 (#3261)
- MODAL
- center a div
- MOAR CODE
- Beautiful go to line modal


Release Notes:
- N/A
2023-11-08 17:16:00 -07:00