Commit Graph
27 Commits
Author SHA1 Message Date
Mikayla 78cea69172 Add focusable view and restore workspace deserialization. Partially restore split and tab functions 2023-11-15 16:36:43 -08:00
Mikayla 3419aaf17e Fix several shutdown related bugs 2023-11-14 11:42:58 -08:00
Mikayla 9b30f490c7 Merge branch 'main' into add-collab-tests 2023-11-08 09:57:08 -08:00
Mikayla ea6755b1ca Checkpoint 2023-11-06 14:26:10 -08:00
Mikayla e1525e2b47 Get collab2 green 2023-11-03 18:01:06 -07:00
Antonio Scandurra 64ad8943ba Remove more Send bounds and simplify view rendering 2023-11-02 09:44:16 +01:00
57ffa8201e Start removing the Send impl for App
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
2023-11-01 13:53:45 -06:00
Max BrunsfeldandMarshall 291d35f337 Merge branch 'main' into zed2-project-test
Co-authored-by: Marshall <marshall@zed.dev>
2023-10-31 11:50:56 -07:00
Conrad Irwin 3e5379526e Fix entity map drop behavior
The entity map needs to be able to distinguish between the case when
the entity_id is waiting to be dropped, and when it is completely gone.

Before 8bc207141, it assumed that entity_ids in dropped_entity_ids could
be re-used. This caused `take_dropped` to error because the slot had
been overwritten. The fix there caused weak handles to allow upgrading
a reference count from 0, which could resurrect items in
`dropped_entity_ids` which caused them to be dropped twice.

We could allow weak items to upgrade from 0, and delete from
dropped_entity_ids, but that seemed more complicated than necessary.
2023-10-31 13:09:35 +00:00
Mikayla f5b13071f1 experiment with a way to recover the any entities when downcasting fails 2023-10-30 18:08:38 -07:00
Mikayla 6f1197e00c Change model to downcast with ownership 2023-10-30 18:00:37 -07:00
Mikayla 327a2f9967 Add the entity trait and implement for models, views, subscriptions, and observations 2023-10-30 17:50:21 -07:00
30dffbb409 Introduce a Render trait, make views implement it
Don't pass a render function separately from the view.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio <as-cii@zed.dev>
2023-10-30 15:19:40 -07:00
bc4f8fbf4e Rename other references from "handle" to "model"
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>
2023-10-30 19:54:32 +01:00
Antonio Scandurra 1a54ac0d69 Rename Handle to Model 2023-10-30 19:44:01 +01:00
Conrad Irwin adc426b668 v1 2023-10-26 18:19:57 +02:00
Antonio Scandurra 8e3314e680 WIP 2023-10-26 18:17:45 +02:00
Antonio Scandurra 637cff3ebd WIP 2023-10-26 17:15:19 +02:00
Max BrunsfeldandConrad 8bc2071414 Fix gpui2 bugs
* Compile error for tests that take StdRng
* Dynamic type dowcasting error when emitting events
* Slot error when dropping handles

Co-authored-by: Conrad <conrad@zed.dev>
2023-10-26 15:54:19 +02:00
Kirill Bulatov 483ac9491a Start fixing room2 2023-10-26 11:27:12 +02:00
Antonio Scandurra 5ba04dce2b Assert handles are passed to the right contexts 2023-10-25 19:46:13 +02:00
Nathan Sobo 9f9137cf76 Remove failed attempt at eliminating static bounds on entities 2023-10-24 15:12:51 +02:00
Nathan Sobo 0910760b76 Reduce the need for Send + Sync bounds on generics 2023-10-24 14:20:01 +02:00
Antonio Scandurra efbf0c828d WIP 2023-10-23 16:38:34 +02:00
Antonio Scandurra 4e6fb9034d WIP 2023-10-23 14:59:57 +02:00
Antonio Scandurra f4135e6bcf WIP 2023-10-22 12:21:28 +02:00
Antonio Scandurra e4fe9538d7 Checkpoint 2023-10-21 16:01:47 +02:00