oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,814 Commits 1 Branch 0 Tags
ff277009139b840f153f02a536019bd59c865d23
Commit Graph
211 Commits
Author SHA1 Message Date
Antonio Scandurra ff27700913 Fix outstanding errors in gpui2 2023-11-02 09:08:47 +01:00
Nathan Sobo 3e7df82977 WIP: Merge branch 'main' into zed2-workspace 2023-11-01 22:35:02 -06:00
Nathan Sobo db9ccd7f34 Merge remote-tracking branch 'origin/main' into gpui2-no-send 2023-11-01 21:10:31 -06:00
Nathan Sobo 57dfc50687 Get language2 tests passing by not blocking on a foreground task 2023-11-01 21:04:17 -06:00
Nathan Sobo 53066df522 Get project2 tests green 2023-11-01 20:14:40 -06:00
Max Brunsfeld 401ddc6f49 WIP - flush_fs_events 2023-11-01 17:45:38 -07:00
Max BrunsfeldandNathan Sobo 6ee93125d0 Fix hangs in new dispatcher 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2023-11-01 17:11:42 -07:00
Conrad Irwin 90facc051a beautiful diff 2023-11-01 15:31:37 -06:00
Conrad Irwin f415a37a3d Uncomment project2 tests (#3200) 2023-11-01 20:27:53 +00:00
Conrad Irwin cd10ba9e06 Use run_until_parked instead of blocked in tests 2023-11-01 14:27:25 -06:00
Nathan Sobo 3f34a8e7ec Checkpoint 2023-11-01 14:00:26 -06:00
Nathan Sobo 11b6d9e33a Split out a foreground and background executor 2023-11-01 13:53:45 -06:00
Max Brunsfeld dd1a2a9e44 wip 2023-11-01 13:53:45 -06:00
Max BrunsfeldAntonioNathan
 		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
Mikayla e82d8eb5b8 Merge branch 'main' into zed2-workspace 2023-11-01 11:46:28 -07:00
Antonio Scandurra 337a79e35f WIP 2023-11-01 18:34:51 +01:00
Marshall Bowers b910bbf002 Add ui_font_size setting (#3199) 
This PR adds a new `ui_font_size` setting that can be used to control
the scale of the entire UI.

We use the value in this setting to set the base rem size of the window.

Release Notes:

- N/A
 2023-11-01 13:11:12 -04:00
Antonio Scandurra c3a8bab4d2 WIP 2023-11-01 17:21:58 +01:00
Antonio Scandurra 147db607c7 WIP 2023-11-01 16:24:19 +01:00
Kirill Bulatov e8857d959b WIP 2023-11-01 16:10:07 +02:00
Antonio Scandurra 4d320f065e WIP 2023-11-01 12:47:19 +01:00
Nathan Sobo d47ef6470b WIP 2023-10-31 22:32:18 -06:00
Nathan Sobo 4da8ee1e1d Remove one todo from the critical path 2023-10-31 21:19:32 -06:00
Julia 795369a1e3 Port multi_buffer to gpui2 2023-10-31 18:34:36 -04: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
Nathan Sobo fd15551d97 Remove Reference 2023-10-31 11:29:13 -06:00
Nathan Sobo 8f1000ea10 Checkpoint 2023-10-31 11:27:08 -06:00
Nathan Sobo 9798d65cf9 Checkpoint 2023-10-31 11:22:40 -06:00
Nathan Sobo 90601fe4fd Checkpoint 2023-10-31 11:16:08 -06:00
Nathan Sobo 0a2fde8707 WIP 2023-10-31 11:03:01 -06:00
Antonio Scandurra 66b520a513 Call initialize on the rendered element on AnyView 2023-10-31 17:17:42 +01:00
Conrad Irwin 8db6b78fdd Implement start/finish waiting for gpui2 
I'm not sure these are strictly necessary, but it will make porting
tests easier to have them.
 2023-10-31 16:14:10 +00:00
Conrad Irwin 0e9a82711c Actually deliver test events to subscribers 2023-10-31 16:04:33 +00:00
Conrad Irwin 81f8e81e48 Fix block to allow for sync progress 2023-10-31 15:57:01 +00:00
KCaverly 551171a339 Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace 2023-10-31 11:39:34 -04:00
KCaverly 68a1c7ce4c wip 2023-10-31 11:32:56 -04:00
Antonio ScandurraandNathan Sobo 0aa9c6b61d Introduce AnyWeakView 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-10-31 16:19:46 +01:00
Antonio ScandurraandNathan Sobo 7b6514b178 Simplify AnyView 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-10-31 16:16:30 +01:00
KCaverlyandKirill 5550e80c4e workspace2 is compiling 
Co-Authored-By: Kirill <kirill@zed.dev>
 2023-10-31 11:14:43 -04:00
KCaverly e315e1bb6c small window change 2023-10-31 10:50:28 -04:00
Conrad Irwin b8e007c6ec Call flush_effects in test context update() 
In gpui1 we used to do this even outside of top-level contexts, but not
sure we should make tests work that differently to the main app.
 2023-10-31 14:24:12 +00:00
KCaverly efce38fce2 wip 2023-10-31 10:04:04 -04: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
Antonio Scandurra 14a6199b4b WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra e8eea52d0f Allow WeakView<T> to be hashed and compared 2023-10-31 13:34:54 +01:00
Antonio Scandurra 46a99c5c41 Allow View<T> to be hashed and compared 2023-10-31 13:34:29 +01:00
Antonio Scandurra 163fa3ff16 Introduce {Window,View}Context::defer 2023-10-31 13:17:05 +01:00
Antonio Scandurra 538a9e1392 WIP 2023-10-31 11:56:55 +01:00
Antonio Scandurra 00c92ae407 Merge branch 'zed2' into zed2-workspace 2023-10-31 10:20:03 +01:00
Antonio Scandurra 88875fd006 Zed2 entities (#3189) 
Adds an `Entity` trait for abstracting over `View`s and `Model`s, and
implements it for the `subscribe()` and `observe()` APIs.

The last commit also includes a fun experiment I added, using the
`Result` type to return the owned model handles back to the caller in
the case of downcast failure, inspired by the `binary_search*` methods.
 2023-10-31 10:11:25 +01:00