Commit Graph
190 Commits
Author SHA1 Message Date
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
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
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
KCaverly efce38fce2 wip 2023-10-31 10:04:04 -04: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
Julia db34de6be4 Port zed/src/languages to zed2 2023-10-30 21:52:29 -04: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
Mikayla 3dadfb8ba8 Merge branch 'zed2' into zed2-workspace 2023-10-30 16:53: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
Antonio Scandurra 0128079de0 WIP 2023-10-30 20:36:48 +01: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
Antonio Scandurra 9688937468 WIP 2023-10-30 19:33:23 +01:00
Antonio Scandurra b9ce186d21 WIP 2023-10-30 16:54:55 +01:00
Antonio Scandurra e2ee9a28bf Implement activate_workspace_for_project 2023-10-30 14:50:50 +01:00
Antonio Scandurra bd750fbbe2 Merge branch 'zed2' into zed2-workspace 2023-10-30 12:16:34 +01:00
Antonio Scandurra 25e882d72a Remove randomness from GPUI2 block_with_timeout 2023-10-30 12:10:55 +01: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
Conrad Irwin 67ecc2fe04 Comment out failing gpui2 test 2023-10-27 11:24:23 +02:00
Conrad Irwin af0c010b4a Remove deadlock from gpui2 pasteboard 2023-10-27 11:14:13 +02:00
Conrad Irwin 5f5234c5da Fix fs2 tests 2023-10-27 10:51:36 +02:00