oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,313 Commits 1 Branch 0 Tags
3e5379526ebdfbc769a83cef60f53d406bbdcbb4
Commit Graph
132 Commits
Author SHA1 Message Date
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
Conrad Irwin adc426b668 v1 2023-10-26 18:19:57 +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
Marshall Bowers d62c51a4b8 Merge branch 'gpui2-element-renderer' into zed2 2023-10-26 15:23:02 +02:00
Marshall Bowers fccc4ca85c Initialize element before layout 2023-10-26 15:22:48 +02:00
Max BrunsfeldConradKyleJoseph
 		69e5ecc015 Enable client tests 
* implement Executor::advance_clock

Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by:  Kyle <kyle@zed.dev>
Co-authored-by:  Joseph <joseph@zed.dev>
 2023-10-26 14:44:13 +02:00
Kirill Bulatov 27d2accb51 Fix the formatting 2023-10-26 13:52:04 +02:00
Kirill Bulatov 0a04c5734b Update mouse position during file drag and drop 2023-10-26 13:50:35 +02:00
Max Brunsfeld a4b7e3c9f6 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
Conrad IrwinConradKyle
 		065d26f5b2 Get RPC2 tests passing 
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
 2023-10-26 12:47:37 +02:00
Nathan Sobo 0285284ae1 Rename IntoAnyElement trait to Component 2023-10-26 12:46:52 +02:00
Nathan Sobo 8ecfea55cd Replace derive Element with derive IntoAnyElement everywhere 2023-10-26 12:38:23 +02:00
Antonio ScandurraMikaylaKirill
 		06c22206af Add install_cli2 
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-Authored-By: Kirill <kirill@zed.dev>
 2023-10-26 12:09:54 +02:00
Nathan Sobo db15db45ce WIP 2023-10-26 11:31:47 +02:00
Kirill Bulatov 483ac9491a Start fixing room2 2023-10-26 11:27:12 +02:00
Conrad Irwin 6185c935a6 Fix small bugs in gpui2::test 2023-10-26 11:23:07 +02:00
Nathan Sobo 45a8aea0f0 Make FnOnces that render elements IntoAnyElement 2023-10-26 11:21:42 +02:00
Marshall Bowers 4266ead958 WIP: Trait bounds 2023-10-26 10:46:02 +02:00
Conrad Irwin 5651ef7ca2 Use quit to end tests 2023-10-26 10:40:04 +02:00
Conrad Irwin 51aa0d6a94 Clearer error on importing both gpui and gpui2 2023-10-26 10:39:52 +02:00
Marshall Bowers 8b972f6d8e WIP: Fix compilation of gpui2 2023-10-26 09:51:33 +02:00
Marshall Bowers 965bfd8439 WIP: Pass in V to Element 2023-10-26 09:45:26 +02:00
Antonio Scandurra c5763cdb99 Fix errors in passing TestAppContext in async gpui2 tests 2023-10-25 21:08:00 +02:00
Antonio ScandurraConrad IrwinMax BrunsfeldKyle
 		43d230cb2d Introduce a gpui2::test macro 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
 2023-10-25 21:08:00 +02:00
Marshall Bowers 7ec9cc08c7 Fix z-index targeting for drag and drop 2023-10-25 20:49:40 +02:00
Marshall Bowers 5355007719 Clean up some warnings 2023-10-25 20:40:50 +02:00
Antonio Scandurra 5ba04dce2b Assert handles are passed to the right contexts 2023-10-25 19:46:13 +02:00
Antonio ScandurraMaxConradKyle
 		412c0ff7dc Add fs2 
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad <conrad.irwin@gmail.com>
Co-Authored-By: Kyle <kyle@zed.dev>
 2023-10-25 19:17:50 +02:00
Antonio ScandurraConrad IrwinKyle
 		1b75603f63 Implement os_name, os_version and app_version for TestPlatform 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Kyle <kyle@zed.dev>
 2023-10-25 18:30:06 +02:00
Antonio ScandurraMaxConradKyle
 		52f9f90ccb Implement TestAppContext::new 
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad <conrad@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
 2023-10-25 18:28:05 +02:00
Marshall Bowers 98e2490807 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-25 18:20:22 +02:00
Marshall Bowers a0fe859d87 Make theme converter spit out valid Rust structs 2023-10-25 18:20:16 +02:00
Antonio ScandurraMaxKyleConrad
 		51fb33d8ef Allow different app contexts to race 
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
Co-Authored-By: Conrad <conrad@zed.dev>
 2023-10-25 18:11:38 +02:00
Antonio ScandurraMaxConrad IrwinKyle Caverly
 		92535ba2c4 Introduce TestAppContext 
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
 2023-10-25 17:55:20 +02:00
Antonio Scandurra 6f6495ccbf Fix error 2023-10-25 17:41:40 +02:00
Antonio ScandurraConrad IrwinMax BrunsfeldKyle Caverly
 		3566d920c5 Add deterministic TestDispatcher 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
 2023-10-25 17:33:55 +02:00
Kirill BulatovandNathan Sobo a01b507ef4 Add OS file drop event handler 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-10-24 19:26:06 +02:00
Marshall Bowers d6bd000aa8 Rename cx.global_default_mut to cx.global_default 2023-10-24 17:58:14 +02:00
Marshall Bowers 4ca7ddfc42 Finish up ThemeRegistry and remove AnyAssetSource 2023-10-24 17:47:41 +02:00
Marshall Bowers 51c66f508b Merge branch 'zed2' into theme2 2023-10-24 17:29:25 +02:00
Marshall Bowers 5fb8321ee0 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-24 17:00:11 +02:00
Marshall Bowers 09866ec3e9 WIP 2023-10-24 16:59:24 +02:00
Marshall Bowers 9f8aaa4cdb Add AnyAssetSource 2023-10-24 16:59:01 +02:00
Antonio Scandurra 11953e613b Checkpoint 2023-10-24 16:15:20 +02:00
Antonio Scandurra 9aaf7d0c46 Checkpoint 2023-10-24 15:30:16 +02:00
Nathan Sobo 9f9137cf76 Remove failed attempt at eliminating static bounds on entities 2023-10-24 15:12:51 +02:00
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