oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,099 Commits 1 Branch 0 Tags
ffce5ff084e5fedbbe42e7bdd6c4713d2b5b8d3e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo fbee6b5352 Get editor2 compiling with a ton of code commented out 2023-11-02 23:35:20 -06:00
Nathan Sobo f3b8a9d8c2 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo a731f8fb1e WIP 2023-11-02 21:28:56 -06:00
Nathan Sobo dfc7c81500 WIP 2023-11-02 21:03:29 -06:00
Nathan Sobo 72b9dc8216 Merge remote-tracking branch 'origin/main' into editor2 2023-11-02 20:47:09 -06:00
Nathan Sobo 6a89f7ce4f rich text2 (#3220) 
- git -> git3
- Add rich_text2

[[PR Description]]

Release Notes:

N/A
 2023-11-02 20:46:45 -06:00
Nathan Sobo 2a12e8f307 Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -06:00
Nathan Sobo 9052b48949 Use correct color values in quad fragment shader (#3217) 
Previously, when using rounded corners, the borders would get wider.
Looks like we weren't using the input color values consistently in the
fragment shader. The quad values are raw HSLA and are converted in the
vertex shader.

Release Notes:

- N/A
 2023-11-02 17:49:56 -06:00
Nathan Sobo 7b712ac68f WIP 2023-11-02 16:47:14 -06:00
Nathan SoboandJulia Risley 91f3e9707a Use correct color values in quad fragment shader 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-11-02 13:18:20 -06:00
Nathan Sobo d1cb2d3e11 Enforce Send bound on next frame callback functions, because they're invoked on arbitrary threads (#3215) 
This enforces the send bound, then uses an async task looping on a
channel to run callbacks on the main thread.
 2023-11-02 12:36:38 -06:00
Nathan Sobo 29d8390743 Fix formatting 2023-11-02 12:28:58 -06:00
Nathan Sobo 1dd20d4c0a Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow 2023-11-02 12:25:06 -06:00
Nathan SoboandJulia Risley 04a8ee222b Enforce a Send bound on next frame callbacks 
This required using mpsc channels to invoke frame callbacks on the
main thread and send the receiver to the platform display link.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-11-02 12:01:22 -06:00
Nathan Sobo 52e195b47c WIP 2023-11-02 07:46:49 -06:00
Nathan Sobo 3e7df82977 WIP: Merge branch 'main' into zed2-workspace 2023-11-01 22:35:02 -06:00
Nathan Sobo 6cab5c2885 Restore foreground/background distinction and confine application state to the main thread (#3206) 
The potential for deadlock and other complexity ended up convincing us
that the benefits of making the app state accessible from any thread
were not worth their cost. We probably could have gone back to the old
executors, but we decided to fix forward and continue to get the
benefits of the new dispatcher.
 2023-11-01 21:29:28 -06:00
Nathan Sobo 64ee1bb7a5 Fix prod compile error 2023-11-01 21:19:06 -06:00
Nathan Sobo 2079cd641e Fix post-merge compile errors 2023-11-01 21:16:41 -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
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
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
Nathan Sobo 0ecf6bde73 WIP 2023-10-31 16:15:30 -06: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
Nathan Sobo e27427dce8 Merge branch 'gpui2-docs' into zed2 2023-10-27 17:07:28 -06:00
Nathan Sobo f88ca2e7da Add docs for window.rs, but still incomplete 2023-10-27 22:29:59 +02:00
Nathan Sobo ad7c49e4bb Add doc comments to app.rs 2023-10-27 21:19:48 +02:00
Nathan Sobo bcdffc9963 Merge branch 'zed2-views' into zed2 2023-10-26 19:41:59 +02:00
Nathan Sobo a1c3826858 Add View::update which provides a ViewContext 2023-10-26 19:41:42 +02:00
Nathan Sobo f4cff69729 WIP: Macro not working fully yet 2023-10-26 13:18:58 +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
Nathan Sobo 315744ec20 Add derive macro for IntoAnyElement 2023-10-26 12:20:46 +02:00
Nathan Sobo 927278e20d Remove IntoAnyElement bound from Element trait 2023-10-26 11:49:36 +02:00
Nathan Sobo db15db45ce WIP 2023-10-26 11:31:47 +02:00
Nathan Sobo 45a8aea0f0 Make FnOnces that render elements IntoAnyElement 2023-10-26 11:21:42 +02:00
Nathan Sobo db7d12f628 WIP 2023-10-26 10:59:27 +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
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
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
Nathan Sobo 96f2c4a9de Checkpoint 2023-10-23 14:15:12 +02:00
Nathan Sobo da8919002f Fix runtime errors 2023-10-23 11:34:35 +02:00
Nathan Sobo 909fbb9538 Checkpoint 2023-10-21 19:07:59 +02:00
Nathan Sobo 89f4718ea1 Checkpoint 2023-10-21 18:48:30 +02:00
Nathan Sobo 695a24d8a7 Checkpoint 2023-10-17 08:26:12 +02:00
Nathan Sobo 2472142532 Checkpoint 2023-10-17 06:09:03 +02:00
Nathan Sobo bf49f55c95 Include length in run to not use tuples 2023-10-17 05:15:00 +02:00
Nathan Sobo 0df1eb71cb Use cloned 2023-10-17 05:08:56 +02:00
Nathan Sobo 3127c78bc7 Fix compile error 2023-10-16 20:19:04 +02:00
Nathan Sobo 938dd8b9ca Checkpoint 2023-10-16 20:16:35 +02:00
Nathan Sobo 847376cd8f WIP 2023-10-16 20:15:41 +02:00
Nathan Sobo 1a3650ef2a Get everything rendering again 2023-10-16 20:15:24 +02:00
Nathan Sobo 297b6b282c Make all geometry types Default to support movement-based refinement 2023-10-13 12:41:00 -06:00
Nathan Sobo ce8533f83b Checkpoint 2023-10-12 13:27:46 -06:00
Nathan Sobo 3dad0d9811 Add group_active 2023-10-11 21:48:21 -06:00
Nathan Sobo d920f7edc1 Add group hovers 2023-10-11 21:34:08 -06:00
Nathan Sobo f37b83a0ea WIP 2023-10-11 17:18:39 -06:00
Nathan Sobo 93c233b1cf Checkpoint 2023-10-11 13:22:40 -06:00
Nathan Sobo 47b64a5074 Checkpoint 2023-10-11 12:51:56 -06:00
Nathan Sobo e2da2b232e Checkpoint 2023-10-11 11:40:42 -06:00
Nathan Sobo f1cc62c21f WIP 2023-10-10 22:49:47 -06:00
Nathan Sobo f53b63eaf6 Checkpoint 2023-10-10 22:14:47 -06:00
Nathan Sobo 61b8ad38bd Remove state erasure for now 2023-10-10 12:44:40 -06:00
Nathan Sobo e714653478 Checkpoint 2023-10-10 12:42:44 -06:00
Nathan Sobo d70b4f04f6 Checkpoint 2023-10-10 12:41:28 -06:00
Nathan Sobo fe60f264c4 Checkpoint 2023-10-09 21:46:49 -06:00
Nathan Sobo dfdb691f73 Checkpoint 2023-10-09 21:30:14 -06:00
Nathan Sobo 9fe5836240 Move events module up 2023-10-09 21:19:56 -06:00
Nathan Sobo 8074e6b46a Add basic mouse event handling 2023-10-09 21:17:56 -06:00
Nathan Sobo f763ed9a7e Checkpoint 2023-10-09 19:54:29 -06:00
Nathan Sobo 65c7765c07 Checkpoint 2023-10-05 21:02:26 -06:00
Nathan Sobo e99f6c03c1 Synchronize access when starting and stopping display links 
Hoping this prevents panics we were observing when starting.
 2023-10-05 20:46:26 -06:00
Nathan Sobo 6f7c305308 Checkpoint 2023-10-05 14:42:29 -06:00
Nathan Sobo ed20397a2b Checkpoint 2023-10-05 00:13:17 -06:00
Nathan Sobo 1c70ca2214 Checkpoint 2023-10-05 00:08:45 -06:00
Nathan Sobo 77b9a7aa5a Checkpoint 2023-10-04 23:59:21 -06:00
Nathan Sobo 0d0c760d94 Checkpoint 2023-10-04 23:03:00 -06:00
Nathan Sobo 177e385bb9 Checkpoint: Fix a crash 2023-10-04 22:59:01 -06:00
Nathan Sobo 699a5d2944 Checkpoint 2023-10-04 20:35:24 -06:00
Nathan Sobo c8bc68c267 Checkpoint 2023-10-04 15:08:04 -06:00
Nathan Sobo 02d6b91b73 Checkpoint 2023-10-04 15:05:04 -06:00
Nathan Sobo e68b24f839 Checkpoint 2023-10-04 13:43:21 -06:00
Nathan Sobo 25a2554bdd Checkpoint 2023-10-03 21:23:32 -06:00
Nathan Sobo 1e0ff65337 Checkpoint 2023-10-03 20:19:59 -06:00
Nathan Sobo da211bef96 Checkpoint 2023-10-03 20:04:17 -06:00