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
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
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
ba789fc0c4
Remove old theme constructs
2023-10-30 14:47:44 -04:00
Antonio Scandurra
1a54ac0d69
Rename Handle to Model
2023-10-30 19:44:01 +01:00
Marshall Bowers
14d24a9ac6
Remove references to old_theme
2023-10-30 14:36:49 -04:00
Marshall Bowers
7b4e699d0e
Remove themed wrapper
2023-10-30 14:28:25 -04:00
Nathan Sobo
a1c3826858
Add View::update which provides a ViewContext
2023-10-26 19:41:42 +02:00
Antonio Scandurra
637cff3ebd
WIP
2023-10-26 17:15:19 +02:00
Marshall Bowers
61694bba6a
Remove unneeded constructors for stories
2023-10-26 16:46:49 +02:00
Max Brunsfeld and Marshall Bowers
0eae962abf
Represent theme's syntax colors with string keys
...
Co-authored-by: Marshall Bowers <marshall@zed.dev >
2023-10-26 16:38:50 +02:00
Marshall Bowers
ed233d583f
ui2: Remove ElementExt trait
2023-10-26 15:59:18 +02:00
Marshall Bowers
1887f3b594
Rename S type to V
2023-10-26 15:54:43 +02:00
Marshall Bowers
8a70ef3e8f
Remove unused state_type
2023-10-26 15:45:08 +02:00
Marshall Bowers
eb19071d84
ui2: Clean up takes
2023-10-26 15:44:39 +02: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
Marshall Bowers
c9c9db903d
Fix Component derive macro
2023-10-26 14:20:25 +02:00
Kirill Bulatov
27d2accb51
Fix the formatting
2023-10-26 13:52:04 +02:00
Kirill Bulatov
0a04c5734b
Update mouse position during file drag and drop
2023-10-26 13:50:35 +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
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
65389a8fac
Merge branch 'zed2' into gpui2-element-renderer
2023-10-26 10:10:10 +02:00
Marshall Bowers
9fb9885931
Checkpoint: Compiling
2023-10-26 10:08:39 +02:00
Marshall Bowers
9c10152c89
Use Display instead of custom to_string
2023-10-26 09:30:21 +02:00
Marshall Bowers
28ef30f7a2
Removed unused ui2::color module
2023-10-26 09:26:22 +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
e67048ee7b
Load themes from settings and rework Settings trait
2023-10-25 20:37:55 +02:00
Marshall Bowers
a0fe859d87
Make theme converter spit out valid Rust structs
2023-10-25 18:20:16 +02:00
Marshall Bowers
437d147935
Rename player to players
2023-10-25 16:39:06 +02:00
Marshall Bowers
0867175a4e
Remove reference to removed ThemeColor
2023-10-25 16:34:03 +02:00
Marshall Bowers
4fcbc91aca
Add note about fixing dead_code and unused_variables warnings in ui2
2023-10-25 16:33:33 +02:00
Marshall Bowers
e1032c5341
Remove ThemeColor in favor of theme2::Theme
2023-10-25 16:32:44 +02:00
Marshall Bowers
bb3f59252e
Rename theme2 getter to theme
2023-10-25 16:04:49 +02:00
Marshall Bowers
258496700f
Rename theme getter to old_theme
2023-10-25 16:02:47 +02:00
Marshall Bowers
8043d0d8a9
Reference theme2 colors in ThemeColor
2023-10-25 15:58:56 +02:00
Kirill Bulatov and Nathan Sobo
a01b507ef4
Add OS file drop event handler
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-10-24 19:26:06 +02:00
Marshall Bowers
d6bd000aa8
Rename cx.global_default_mut to cx.global_default
2023-10-24 17:58:14 +02:00
Marshall Bowers
09866ec3e9
WIP
2023-10-24 16:59:24 +02:00
Nathan Sobo