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
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
Antonio Scandurra
40c634e056
Merge remote-tracking branch 'origin/main' into editor2-blocks
2023-11-14 17:16:58 +01:00
Antonio Scandurra and Julia
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
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 and conrad
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
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 Sobo and Antonio 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 Osiewicz and Conrad
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
Conrad Irwin
cef8fa5570
tidy tidy
2023-11-08 17:09:38 -07:00
Conrad Irwin
1b9f76c01d
Refactor GoToLine to use cx.observe_new_views()
2023-11-08 16:23:05 -07:00
Conrad Irwin
6a802e2fda
Make Modals dismissable in theory
2023-11-08 14:45:54 -07:00
Mikayla
097efdebc5
WIP
2023-11-08 12:49:09 -08:00
Mikayla
409e17ad30
Merge branch 'main' into go-to-line2
2023-11-08 11:32:36 -08:00
Nate Butler
e4ca2cb20b
Update titlebar
2023-11-08 12:57:31 -05:00
Max Brunsfeld
bdec1c8202
Merge branch 'main' into picker
2023-11-07 16:57:47 -08:00
Max Brunsfeld and Marshall
9fe3073af7
Get basic text input working
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 16:33:02 -08:00
7cdece4857
Beautiful go to line modal
...
Co-authored-by: Julia <julia@zed.dev >
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 15:32:34 -07:00
Marshall Bowers