Conrad Irwin
b19a6c0dcc
Fix storybook2
2023-11-20 10:16:05 -07:00
Conrad Irwin
f86480ba5d
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Nathan Sobo
2515bbf990
Move self in Element::paint
...
Remove mutable state borrows in favor of state ownership in render processes to streamline element rendering.
2023-11-17 23:32:55 -07:00
Mikayla
149b9d1aa6
Merge branch 'main' into managed-view-adjustment
2023-11-17 12:40:44 -08:00
Conrad Irwin
eb04160d2d
Dock menu
2023-11-17 12:14:06 -07:00
Conrad Irwin
9d742b90c3
Allow you to click on a context menu item
2023-11-17 11:57:51 -07:00
Mikayla
17d53d0e38
Rename again, add fun cx APIs using new traits
2023-11-17 10:06:41 -08:00
Mikayla
01d9d53f4a
Adjust the type arrangement on ManagedViews
2023-11-17 09:51:11 -08:00
Conrad Irwin
2d1d75f482
+ManagedView
...
And some games with rust traits
2023-11-16 23:02:10 -07:00
Conrad Irwin
2182cb2656
Ooh generics
2023-11-16 22:16:29 -07:00
Conrad Irwin
6d4276ea5f
Merge branch 'main' into collab_ui2
2023-11-16 22:08:42 -07:00
Conrad Irwin
c0ad15756c
More attachment configuration for context menus
2023-11-16 21:59:23 -07:00
Conrad Irwin
9547e88d88
TEMP
2023-11-16 19:50:31 -07:00
Mikayla
4de2c0f7ef
Re-implement actions as derive macros instead of blanket impls
2023-11-16 17:32:02 -08:00
Conrad Irwin
074a221e0f
Progress on ContextMenu
2023-11-16 16:59:27 -07:00
Kirill Bulatov
ab0a3f19ab
Add an actual context menu into terminal-2
...
(click the text, not the pane!)
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-16 16:36:44 +02:00
Conrad Irwin
496518f3e8
Use gpui instead of gpui2 consistenytly
2023-11-06 11:50:33 -07:00
Marshall Bowers
bf80c1da5b
Rename fields in ThemeColors ( #3242 )
...
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.
This will help prevent this branch from diverging too far from `main`.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-06 11:53:27 -05:00
Nate Butler
b125cc279f
Simplify toggle, do some reorganization
2023-11-04 11:24:31 -04:00
Marshall Bowers
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
Max Brunsfeld
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
61694bba6a
Remove unneeded constructors for stories
2023-10-26 16:46:49 +02:00
Marshall Bowers
1887f3b594
Rename S type to V
2023-10-26 15:54:43 +02:00
Marshall Bowers
7b4a895ab9
ui2: Clean up drains
2023-10-26 15:41:29 +02:00
Marshall Bowers
88ef74ec8f
Checkpoint: Compiling after view type removal
2023-10-26 15:20:38 +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
927278e20d
Remove IntoAnyElement bound from Element trait
2023-10-26 11:49:36 +02:00
Marshall Bowers
9fb9885931
Checkpoint: Compiling
2023-10-26 10:08:39 +02:00
Marshall Bowers
e1032c5341
Remove ThemeColor in favor of theme2::Theme
2023-10-25 16:32:44 +02:00
Marshall Bowers
cf380a9f62
Remove set_ prefix for List setters
2023-10-24 14:18:51 +02:00
Marshall Bowers
c831c5749a
Remove more unneeded Clone bounds
2023-10-20 11:32:10 -04:00
Marshall Bowers
4050bf43c4
Remove Clone bound for Label
2023-10-19 16:31:24 -04: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
Marshall Bowers
8dad3ad8ea
Use SharedString for Lists
2023-10-18 14:19:26 -04:00
Antonio Scandurra
296a2b8e5d
Rename fill to bg
2023-10-18 09:39:23 +02: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
Nate Butler
12573ed2e7
Refine project panel, list item
2023-10-11 19:15:27 -04:00
Nate Butler
0d8c743dfe
Refine project panel, list
2023-10-11 12:22:24 -04:00
Marshall Bowers
30088afa89
Colocate component stories with their components
2023-10-10 15:52:58 -04:00
Marshall Bowers
333e3e4f01
Add ContextMenu component
2023-10-09 11:25:33 -04:00
