Nathan Sobo
2285a35016
Merge branch 'fewer-bounds' into zed2
2023-10-24 14:24:06 +02:00
Nathan Sobo
0910760b76
Reduce the need for Send + Sync bounds on generics
2023-10-24 14:20:01 +02:00
Marshall Bowers
24e21a4c29
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-24 14:11:22 +02:00
Marshall Bowers
bb35583998
Merge branch 'gpui2' into zed2
2023-10-24 14:11:13 +02:00
Kirill Bulatov
0e48465adb
Add a draft of the mac platform file drag and drop events
2023-10-24 14:09:46 +02:00
Antonio Scandurra
9a53da28bc
WIP
2023-10-24 13:10:37 +02:00
Antonio Scandurra
953857f8e3
WIP
2023-10-24 10:31:35 +02:00
Antonio Scandurra
18eb4a7292
WIP
2023-10-24 10:01:19 +02:00
Antonio Scandurra
4d621f355d
WIP
2023-10-23 17:41:22 +02:00
Antonio Scandurra
05cbceec24
WIP
2023-10-23 17:36:49 +02:00
Nathan Sobo
192b3512fd
Merge branch 'gpui2-drag-drop' into zed2
2023-10-23 17:18:07 +02:00
Nathan Sobo
ec0b2e5430
Add on_drop listeners
2023-10-23 16:59:16 +02:00
Antonio Scandurra
7832120a4c
WIP
2023-10-23 16:38:34 +02:00
Antonio Scandurra
efbf0c828d
WIP
2023-10-23 16:38:34 +02:00
Nathan Sobo
38a7b39070
Don't start dragging until you move to 2px
2023-10-23 16:20:01 +02:00
Nathan Sobo
239b0c2f71
Clear active state when drag starts
2023-10-23 16:10:04 +02:00
Nathan Sobo
258fcaea94
Position drag handle relative to cursor
2023-10-23 15:20:33 +02:00
Nathan Sobo
fc927f7406
Checkpoint
2023-10-23 15:14:10 +02:00
Nathan Sobo
d1adce5890
Show red box when dragging
2023-10-23 15:09:22 +02:00
Antonio Scandurra
4e6fb9034d
WIP
2023-10-23 14:59:57 +02:00
Nathan Sobo
96f2c4a9de
Checkpoint
2023-10-23 14:15:12 +02:00
Antonio Scandurra
a72434f67b
WIP
2023-10-23 12:16:33 +02:00
Antonio Scandurra
c0e8ae5dfa
WIP
2023-10-23 11:53:24 +02:00
Antonio Scandurra
0de4a93ec7
WIP
2023-10-23 11:43:08 +02:00
Nathan Sobo
da8919002f
Fix runtime errors
2023-10-23 11:34:35 +02:00
Antonio Scandurra
56462ef793
Checkpoint
2023-10-23 10:59:29 +02:00
Antonio Scandurra
a0b667a2ca
WIP
2023-10-22 19:56:25 +02:00
Antonio Scandurra
e7c04d4aca
Checkpoint
2023-10-22 18:56:11 +02:00
Antonio Scandurra
ce75be91e1
Checkpoint
2023-10-22 18:25:24 +02:00
Antonio Scandurra
db6a3e1783
WIP
2023-10-22 18:01:00 +02:00
Antonio Scandurra
7171818d24
WIP
2023-10-22 16:36:29 +02:00
Antonio Scandurra
48033463c8
WIP
2023-10-22 16:33:59 +02:00
Antonio Scandurra
6ffeb048b3
WIP
2023-10-22 16:27:23 +02:00
Antonio Scandurra
5423012368
WIP
2023-10-22 13:15:29 +02:00
Antonio Scandurra
f4135e6bcf
WIP
2023-10-22 12:21:28 +02:00
Nathan Sobo
909fbb9538
Checkpoint
2023-10-21 19:07:59 +02:00
Antonio Scandurra
2e2825ae98
WIP
2023-10-21 18:41:09 +02:00
Antonio Scandurra
3740c9d852
WIP
2023-10-21 18:33:08 +02:00
Antonio Scandurra
7bb99c9b9c
WIP
2023-10-21 18:30:44 +02:00
Antonio Scandurra
aa3fb28f81
WIP
2023-10-21 18:21:14 +02:00
Antonio Scandurra
b7d30fca2b
WIP
2023-10-21 17:52:47 +02:00
Antonio Scandurra
e4fe9538d7
Checkpoint
2023-10-21 16:01:47 +02:00
Antonio Scandurra
f3979a9f28
Checkpoint
2023-10-21 15:59:52 +02:00
Nathan Sobo
d920f7edc1
Add group hovers
2023-10-11 21:34:08 -06:00
Marshall Bowers
a4bde421db
Revert changes to gpui2 crate
2023-10-07 10:50:50 -04:00
Marshall Bowers
f6a4151f60
Merge branch 'main' into gpui2
2023-10-07 10:50:05 -04:00
456baaa112
Mainline GPUI2 UI work ( #3099 )
...
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.
Included in this is a performance improvement to make use of the
`TextLayoutCache` when calling `layout` for `Text` elements.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com >
Co-authored-by: Antonio Scandurra <me@as-cii.com >
2023-10-06 13:18:56 -04:00
Nathan Sobo
45429b5400
WIP
2023-10-03 14:25:29 -06:00
f26ca0866c
Mainline GPUI2 UI work ( #3062 )
...
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com >
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com >
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com >
Co-authored-by: Nate <nate@zed.dev >
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-09-28 19:36:21 -04:00
Marshall Bowers
568fec0f54
Add Sized bound to StyleHelpers ( #3042 )
...
This PR adds a `Sized` bound to the `StyleHelpers` trait.
All of the individual methods on this trait already had a `Self: Sized`
bound, so moving it up to the trait level will make it so we don't have
to repeat ourselves so much.
There's an open question of whether we can hoist the `Sized` bound to
`Styleable`, but it's possible there are cases where we'd want to have a
`Styleable` trait object.
Release Notes:
- N/A
2023-09-26 18:15:41 -04:00
Nathan Sobo
Marshall Bowers
Kirill Bulatov
Antonio Scandurra
