Nate Butler and Marshall Bowers
40a49e6896
Update popover doc
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-21 12:43:56 -05:00
Nate Butler and Marshall Bowers
9a145a4d86
Correctly position popover aside, add list item states
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-21 12:40:48 -05:00
Nate Butler and Marshall Bowers
9f2e3bab9b
Allow popover to take an aside
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-21 12:26:10 -05:00
Nate Butler
dac7912e87
Start on popover
2023-11-21 12:10:06 -05:00
Marshall Bowers
f4b4bdfd83
ui2: Get component stories compiling again ( #3376 )
...
This PR gets the component stories defined in `ui2` compiling again.
Release Notes:
- N/A
2023-11-21 12:06:25 -05:00
Nate Butler
f04deeb5f9
Document InteractionState
2023-11-21 11:51:15 -05:00
Antonio Scandurra
f2c63781f9
Merge branch 'main' into editor2-autocomplete
...
# Conflicts:
# crates/editor2/src/editor.rs
2023-11-21 17:43:09 +01:00
Nate Butler
bec61123fd
Update toolbar.rs
2023-11-21 11:06:27 -05:00
Marshall Bowers
6cd0bcc578
Fix panic when opening settings in zed2 ( #3375 )
...
This PR fixes a panic that occurs when opening the settings in zed2.
We store the `ThemeRegistry` as a global without wrapping it in an
`Arc`, so we need to retrieve it the same way.
Release Notes:
- N/A
2023-11-21 10:58:52 -05:00
Nate Butler
209fb10731
Remove stories mod until it is re-enabled
2023-11-21 01:36:35 -05:00
Nate Butler
8947438510
Update elevation
2023-11-21 01:23:47 -05:00
Nate Butler
453aa5ffd7
TextColor -> Color
2023-11-21 01:05:29 -05:00
Nate Butler
56d45e72cd
Add Shape enum to avatar component, refactor UITextSize to styles/typography.rs
2023-11-21 00:59:29 -05:00
Nate Butler
205607a9cd
Clean out UI
2023-11-21 00:44:51 -05:00
Piotr Osiewicz
2138715fca
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 01:16:21 +01:00
Mikayla and Piotrek
a844bf7d41
Fix stories
...
co-authored-by: Piotrek <piotr@zed.dev >
2023-11-20 16:06:10 -08:00
Piotr Osiewicz and Mikayla
3e329861f9
Brave new world awaits
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-21 00:47:47 +01:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Conrad Irwin
8049ec674e
Fix last thing
2023-11-20 16:35:56 -07:00
Conrad Irwin
5c0f2e75ea
Remove all the settings
2023-11-20 16:30:14 -07:00
Conrad Irwin
3e2dba36b4
Merge branch 'main' into callback-handles
2023-11-20 16:28:35 -07:00
Conrad Irwin
8b6b7e60be
borrow less
2023-11-20 16:00:47 -07:00
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev >
co-authored-by: Nathan <nathan@zed.dev >
2023-11-20 14:46:01 -08:00
Marshall Bowers
652e3b0bb6
Rename ListEntry to ListItem ( #3371 )
...
This PR renames the `ListEntry` component to `ListItem` to better
reflect its intent.
Release Notes:
- N/A
2023-11-20 16:13:06 -05:00
Joseph T. Lyons
daddb03e7a
Remove comments
2023-11-20 16:04:32 -05:00
Joseph T. Lyons
a0dcc9618e
Mark app event as open if we fail to get installation_id
...
If we find a previous installation_id, then we send `open`. If we don't find a previous installation_id, then we sent as `first open`. If we fail, we mark it as `open` so that we don't accidentally bloat our `first open` stats.
2023-11-20 16:04:15 -05:00
Joseph T. Lyons
db3f487474
Fix zed2 compile error
2023-11-20 16:00:05 -05:00
Joseph T. Lyons
0926db9111
Add app events
2023-11-20 15:51:36 -05:00
Max Brunsfeld
4f4ef4a357
More fixes for zed nightly ( #3370 )
...
When running `script/bundle` with the new `-2` flag, we needed to adjust
the fat-binary creation step to look for the binary called `Zed2`.
We also fixed a source of intermittent build failures in `script/bundle`
due to running multiple `swift build` processes concurrently for the
`live_kit_client2` crate, building for the two architectures.
Release Notes:
NA
2023-11-20 12:36:25 -08:00
Max Brunsfeld and Julia
2731855487
Fix error when building live_kit_client2 for two architectures concurrently
...
Co-authored-by: Julia <julia@zed.dev >
2023-11-20 12:10:35 -08:00
Marshall Bowers
eb307b22f0
Rework List to use children ( #3369 )
...
This PR reworks the `List` component to use `children` instead of
accepting a `Vec<ListItem>` in its constructor.
This is a step towards making the `List` component more open.
Release Notes:
- N/A
2023-11-20 14:58:31 -05:00
Mikayla
6985b70859
fix gpui2
2023-11-20 11:55:27 -08:00
Conrad Irwin
25ed7c57c1
WIP
2023-11-20 12:34:08 -07:00
Conrad Irwin
d0dd44faad
Merge branch 'main' into callback-handles
2023-11-20 12:21:42 -07:00
Max Brunsfeld and Mikayla
babd41916a
Remove gpui (1) dependencies from zed2
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-20 10:46:16 -08:00
Piotr Osiewicz
fe0a8b4be2
Fix warnings in tests
2023-11-20 19:25:14 +01:00
Piotr Osiewicz
d60855b06d
Merge branch 'main' into search2
2023-11-20 19:23:35 +01:00
Piotr Osiewicz
99ef8ccd3f
fixup dismissing of search bar
2023-11-20 19:07:37 +01:00
Piotr Osiewicz
3ddfc7ff61
Remove unused import
2023-11-20 18:44:51 +01:00
Piotr Osiewicz
fa8cd843ca
fixup! Merge branch 'main' into search2
2023-11-20 18:42:15 +01:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Piotr Osiewicz
3d28495c67
fixup! Remove dbg statements
2023-11-20 18:35:39 +01:00
Piotr Osiewicz
ad38708ede
Remove dbg statements
2023-11-20 18:31:30 +01:00
Piotr Osiewicz
c1f0ac30a0
Fix up tests once and for good
2023-11-20 18:24:37 +01:00
Conrad Irwin
b19a6c0dcc
Fix storybook2
2023-11-20 10:16:05 -07:00
Conrad Irwin
5d16f76518
fmt
2023-11-20 10:05:57 -07:00
Conrad Irwin
8599ba557d
Fix more import errors
2023-11-20 10:01:21 -07:00
Conrad Irwin
f08426c7a0
shhhh
2023-11-20 10:00:37 -07:00
Conrad Irwin
f86480ba5d
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Nate ButlerandMarshall Bowers
Marshall Bowers
Antonio Scandurra
Piotr Osiewicz
MikaylaandPiotrek
Conrad Irwin
Joseph T. Lyons
Max Brunsfeld
