Nate Butler
bdbb7bcb3b
Extend tooltip to take meta + kb
2023-11-14 12:59:53 -05:00
Antonio Scandurra
c4a5f47bc3
Merge remote-tracking branch 'origin/main' into editor2-blocks
2023-11-14 17:16:58 +01:00
Antonio Scandurra and Julia
05a555e2ef
Honor cmd-w to close active item
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-14 16:38:20 +01:00
Nate Butler
3ceadaa609
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
Conrad Irwin
0bbd5b0775
Allow clicking on commands in the command palette
2023-11-13 21:42:27 -07:00
Nate Butler
9624355db1
Allow a button to take a color
2023-11-13 19:46:15 -05:00
Mikayla
b83845913e
Merge branch 'main' into editor-tests
2023-11-13 15:53:22 -08:00
Mikayla and conrad
a0ef21d91d
WIP
...
co-authored-by: conrad <conrad.irwin@zed.dev >
2023-11-13 15:53:04 -08:00
Marshall Bowers
db0bfd17d0
Combine related conditions
2023-11-13 18:22:04 -05:00
Marshall Bowers
8e2a7b803f
Merge branch 'main' into one-themes
2023-11-13 18:16:45 -05:00
Nate Butler
a11ce4954e
Start refining tab
2023-11-13 17:51:58 -05:00
Conrad Irwin
235edc51c8
Merge branch 'main' into dispatch-tree
2023-11-13 13:21:57 -07:00
Mikayla
c0b2ecf405
Get editor tests compiling
2023-11-13 12:10:14 -08:00
Antonio Scandurra
f021e72b06
Register actions on the right div
2023-11-13 15:21:47 +01:00
Kirill Bulatov
6765223273
Uncomment all inlay hint cache code and tests
2023-11-13 14:07:48 +02:00
Nathan Sobo
a3ec1048fd
WIP
2023-11-10 14:47:45 -07:00
Nathan Sobo and Antonio Scandurra
f5cc32c077
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
95c1ae6316
Fix panic caused by focusing the same thing twice
2023-11-09 22:25:46 -07:00
Conrad Irwin
8decd62115
Refactor to make ModalLayer a View
2023-11-09 22:15:44 -07:00
Conrad Irwin
acd60a35c6
Move from register_modals to register_workspace_action
2023-11-09 21:51:48 -07:00
Conrad Irwin
2b2c24afae
Tidy up some more modal behaviour
2023-11-09 21:11:44 -07:00
Conrad Irwin
8b5d37ffa4
Tidy up
2023-11-09 20:58:35 -07:00
Piotr Osiewicz and Conrad
bbc0341411
Fix up keybindings propagation
...
Co-authored-by: Conrad <conrad@zed.dev >
2023-11-09 18:33:36 +01:00
Piotr Osiewicz
9228845242
Start working on command_palette2
2023-11-09 17:54:05 +01:00
Mikayla
22a19cd8ff
Merge branch 'main' into event-emitter
2023-11-08 20:10:38 -08:00
Mikayla
9fd7066ac1
Get workspace compiling with new event emitters
2023-11-08 19:29:00 -08:00
Conrad Irwin
800a7adcf2
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
b839006d27
tidy tidy
2023-11-08 17:09:38 -07:00
Conrad Irwin
282360a8db
Refactor GoToLine to use cx.observe_new_views()
2023-11-08 16:23:05 -07:00
Conrad Irwin
c0c4c4f1f3
Make Modals dismissable in theory
2023-11-08 14:45:54 -07:00
Mikayla
b37f5c083e
WIP
2023-11-08 12:49:09 -08:00
Mikayla
738ca57aba
Merge branch 'main' into go-to-line2
2023-11-08 11:32:36 -08:00
Nate Butler
6257c42f5c
Update titlebar
2023-11-08 12:57:31 -05:00
Max Brunsfeld
61c65bcfaf
Merge branch 'main' into picker
2023-11-07 16:57:47 -08:00
Max Brunsfeld and Marshall
60c1d02011
Get basic text input working
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 16:33:02 -08:00
555a4ba002
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
Conrad Irwin
ae4e0160b6
MOAR CODE
2023-11-07 14:44:36 -07:00
Nate Butler
b931301d81
center a div
2023-11-07 16:23:41 -05:00
Conrad Irwin
11579331d3
MODAL
2023-11-07 13:23:27 -07:00
Max Brunsfeld
0e83f26b44
Remove unused import
2023-11-07 11:47:49 -08:00
Mikayla Maki
a729ad29f1
Merge branch 'main' into picker
2023-11-07 11:44:02 -08:00
Max Brunsfeld
2a38753bb8
Merge branch 'main' into picker
2023-11-07 11:27:14 -08:00
Conrad Irwin
43f553a161
Wire up GoToLine modal
2023-11-07 12:12:05 -07:00
6f2ddc9abe
Add Modals
...
P.S. this is all completely different now
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Julia <julia@zed.dev >
2023-11-07 09:18:34 -07:00
Marshall Bowers
a9db13e190
Rename ThemeVariant to Theme ( #3252 )
...
This PR renames the `ThemeVariant` type to `Theme`.
This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.
Release Notes:
- N/A
2023-11-07 10:41:36 -05:00
Conrad Irwin
20eb31b450
Merge branch 'main' into editor2-rendering
2023-11-06 11:06:43 -07:00
Conrad Irwin
d7f608c1e2
tooltip2 ( #3237 )
...
- Fix executor.timer() in gpui2
- Add support for tooltips
[[PR Description]]
Release Notes:
- N/A
2023-11-06 10:51:01 -07:00
c905d4f66d
Rename fields in ThemeColors ( #3242 )
...
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.
This will help prevent this branch from diverging too far from `main`.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com >
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-06 11:53:27 -05:00
Julia and Conrad Irwin
e56b9f7f45
Move more tooltip logic into gpui2 & fix tooltip moving on paint
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev >
2023-11-03 18:37:15 -04:00
Julia and Conrad Irwin
438dcffdad
Tooltips in mouse event handler & fix executor timer
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev >
2023-11-03 18:02:58 -04:00
Nate Butler