Nate Butler
0817153b76
Extend the theme crate to enable stories, add players story
2023-11-07 21:08:33 -05:00
Nate Butler
26f779d477
Update default player colors
2023-11-07 20:27:00 -05:00
Max Brunsfeld
69c61fb1f4
Implement basic fuzzy filtering in picker
2023-11-07 17:24:04 -08: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
Max Brunsfeld and Marshall
136c115219
Assign editors as text input handlers
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 15:44:00 -08:00
4a89dcfdfc
Implement an InputHandler trait for gpui2
...
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Max <max@zed.dev >
Co-Authored-By: Julia <julia@zed.dev >
2023-11-07 16:30:04 -07: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
Max Brunsfeld and Marshall
ac738e2a04
Get actions + focus working on picker, now that it's a view
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 13:48:32 -08:00
Conrad Irwin
5132635ad2
Merge branch 'main' into go-to-line3
2023-11-07 14:44:45 -07:00
Conrad Irwin
ae4e0160b6
MOAR CODE
2023-11-07 14:44:36 -07:00
Max Brunsfeld
ccb92118f1
Merge branch 'main' into picker
2023-11-07 13:37:49 -08:00
b66074ae98
Start work on adding a filter editor to the picker
...
Implement picker as a view instead of as a component
Co-authored-by: Mikayla <mikayla@zed.dev >
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-07 13:37:10 -08:00
Nate Butler
b931301d81
center a div
2023-11-07 16:23:41 -05:00
Conrad Irwin
e2c4392dbf
Add text and focus to editor
2023-11-07 14:19:15 -07:00
Conrad Irwin
01143d7c0e
Make it possible to render a single line editor
2023-11-07 14:05:23 -07:00
Max Brunsfeld and Mikayla
35d7a7d70a
🎨
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-07 13:03:36 -08: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
Mikayla Maki
fb65fad22b
editor singleline ( #3257 )
...
- Implement Editor::single_line
- Fix confusing error message
- Fix loading keyfiles
- Wire up GoToLine modal
2023-11-07 11:41:33 -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
Conrad Irwin
315859be63
Fix loading keyfiles
2023-11-07 12:04:37 -07:00
Conrad Irwin
ba346432e8
Fix confusing error message
2023-11-07 12:04:21 -07:00
Nate Butler
a5eb90dc5e
Continue documenting theme colors
2023-11-07 14:04:09 -05:00
Max Brunsfeld and Mikayla
c2528fd1ca
Rename List -> UniformList
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-07 11:00:53 -08:00
Max Brunsfeld and Mikayla
dee951c7f8
Remove commented-out code in picker2
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-07 10:53:59 -08:00
Max Brunsfeld and Mikayla
841f18e13d
Implement list scroll tracking
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-07 10:45:38 -08:00
Nate Butler
0b0195f75e
Merge branch 'main' into document-theme
2023-11-07 13:36:08 -05:00
Nate Butler
723ac00cbf
Begin documenting theme colors
2023-11-07 13:36:01 -05:00
Conrad Irwin
2d9315082c
Implement Editor::single_line
2023-11-07 11:12:36 -07:00
Antonio Scandurra
7426071844
Implement movement in editor2 ( #3256 )
...
Release Notes:
- N/A
2023-11-07 19:12:09 +01:00
Conrad Irwin
7caf684353
modals2 ( #3247 )
...
New Modal implementation for gpui2
Release Notes:
N/A
2023-11-07 10:56:46 -07:00
Antonio Scandurra
61a5f961ec
Merge remote-tracking branch 'origin/main' into editor-movement
2023-11-07 18:50:43 +01:00
Antonio Scandurra
800a03407c
Merge remote-tracking branch 'origin/main' into editor-movement
2023-11-07 18:48:08 +01:00
Max Brunsfeld and Mikayla
e4fdf9d1b2
Implement picker actions
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-07 09:46:41 -08:00
Marshall Bowers
a0f395f419
theme_importer: Format generated themes ( #3255 )
...
This PR makes the `theme_importer` format the themes that it generates
automatically.
Release Notes:
- N/A
2023-11-07 12:45:09 -05:00
Max Brunsfeld
30580b8abb
Merge branch 'main' into picker
2023-11-07 09:34:57 -08:00
Antonio Scandurra
fb46fdc925
Merge remote-tracking branch 'origin/main' into editor-movement
2023-11-07 17:54:46 +01:00
Antonio Scandurra
fce2c48f31
WIP
2023-11-07 17:54:14 +01:00
Antonio Scandurra
33ff70942d
Implement scrolling for editor2 ( #3251 )
...
Release Notes:
- N/A
2023-11-07 17:53:57 +01:00
Julia
7331fad5e9
Re-introduce a macro for defining actions for ease of use ( #3253 )
...
Release Notes:
- N/A
2023-11-07 11:51:00 -05:00
Marshall Bowers
fc9a860c79
Rework third-party themes ( #3254 )
...
This PR reworks the way we define our third-party themes to make them
work as overlays on top of a base theme.
We introduce the concept of a `UserThemeFamily` that contains
`UserTheme`s. Rather than being an entire theme definition on their own,
a `UserTheme` just contains optional overrides for the values in a
`Theme`.
When resolving a `UserTheme`, we apply it on top of the base theme. Any
values not overridden in the `UserTheme` will fall back to the `Theme`
defaults.
Right now we are just using `UserTheme` to model third-party themes that
we distribute with the Zed binary. However, this same structure can also
be used to import arbitrary user themes (such as from a theme registry,
or even a theme blob from the settings file).
Release Notes:
- N/A
2023-11-07 11:40:07 -05:00
3faa7ead19
Re-introduce a macro for defining actions for ease of use
...
Co-Authored-By: Piotr Osiewicz <piotr@zed.dev >
Co-Authored-By: Conrad Irwin <conrad@zed.dev >
2023-11-07 11:30:58 -05: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
Conrad Irwin
b133cc9d12
gpui event test ( #3249 )
...
- Flesh out gpui2 test support
- Smoke test for event handling
2023-11-07 08:43:15 -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
b4afdd0cfe
Fix event ordering issues
2023-11-07 08:29:55 -07:00
cfd05d80a7
Clip text when scrolling horizontally
...
Co-Authored-By: Julia <julia@zed.dev >
Co-Authored-By: Piotr <piotr@zed.dev >
2023-11-07 15:50:18 +01:00
Nate Butler