Commit Graph
32 Commits
Author SHA1 Message Date
Nathan Sobo db9ccd7f34 Merge remote-tracking branch 'origin/main' into gpui2-no-send 2023-11-01 21:10:31 -06:00
Nathan Sobo 53066df522 Get project2 tests green 2023-11-01 20:14:40 -06:00
18431051d9 Rework theme2 with new theme structure (#3194)
This PR reworks the theme definition in the `theme2` crate to be based
off of the new theme work that @iamnbutler has been working on.

We're still developing the new theme system, but it is complete enough
that we can now load the default theme and use it to theme the storybook
(albeit with some further refining of the color palette required).

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <marshall@zed.dev>
2023-10-31 22:23:00 -04: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
Marshall Bowers 7b4a895ab9 ui2: Clean up drains 2023-10-26 15:41:29 +02:00
Marshall Bowers d62c51a4b8 Merge branch 'gpui2-element-renderer' into zed2 2023-10-26 15:23:02 +02:00
Marshall Bowers 88ef74ec8f Checkpoint: Compiling after view type removal 2023-10-26 15:20:38 +02:00
Kirill Bulatov 0a04c5734b Update mouse position during file drag and drop 2023-10-26 13:50:35 +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 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
Marshall Bowers 4266ead958 WIP: Trait bounds 2023-10-26 10:46:02 +02:00
Marshall Bowers e31a9401a8 Merge branch 'remove-view-state-associated-type' into gpui2-element-renderer 2023-10-26 10:10:17 +02:00
Marshall Bowers 9fb9885931 Checkpoint: Compiling 2023-10-26 10:08:39 +02:00
Marshall Bowers 06bff41818 WIP: ElementRenderer 2023-10-25 21:08:34 +02:00
Marshall Bowers 7ec9cc08c7 Fix z-index targeting for drag and drop 2023-10-25 20:49:40 +02:00
Marshall Bowers e1032c5341 Remove ThemeColor in favor of theme2::Theme 2023-10-25 16:32:44 +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
Nate Butler 3a326bfa7e 🤦 Remove references to system_color 2023-10-23 11:05:17 -04:00
Antonio Scandurra e4fe9538d7 Checkpoint 2023-10-21 16:01:47 +02:00
Antonio Scandurra a3dcaf21cb Checkpoint 2023-10-20 16:31:03 +02:00
Nate Butler 58650b7d2d Checkpoint - Still Broken 2023-10-19 14:38:01 -04:00
Nate Butler bca97f7186 Checkpoint – Broken 2023-10-19 12:58:17 -04:00
Antonio Scandurra 296a2b8e5d Rename fill to bg 2023-10-18 09:39:23 +02:00
Antonio Scandurra c04171abf6 WIP 2023-10-17 13:32:49 +02:00
Marshall Bowers 30979caf25 Use new children approach for Panes and Toasts 2023-10-12 15:37:50 -04:00
Marshall Bowers 262f5886a4 Checkpoint 2023-10-12 12:18:35 -04:00
Marshall Bowers 8cd112110e Reconcile with upstream changes 2023-10-12 10:40:47 -04:00
Marshall Bowers d5ffd4a1fb Add Pane and PaneGroup components 2023-10-06 18:37:28 -04:00