Conrad Irwin
0a9fb3978b
Enable panel switching
2023-11-15 21:01:00 -07:00
Conrad Irwin
37d0b8424c
Merge branch 'main' into element-types
2023-11-14 12:10:26 -07:00
Marshall Bowers
76c15229c1
Combine LabelColor and IconColor into TextColor
2023-11-14 13:48:01 -05:00
Conrad Irwin
5dda105182
Merge branch 'main' into element-types
2023-11-14 11:45:19 -07:00
Antonio Scandurra
40c634e056
Merge remote-tracking branch 'origin/main' into editor2-blocks
2023-11-14 17:16:58 +01:00
Antonio Scandurra
fc5ec47cc8
WIP
2023-11-14 14:48:59 +01:00
Nathan Sobo
27fb381cca
Checkpoint
2023-11-14 01:15:48 -07:00
Nate Butler
38888696db
Allow a button to take a color
2023-11-13 19:46:15 -05:00
Antonio Scandurra and Nathan
5d15886675
Render code actions indicator
...
Co-Authored-By: Nathan <nathan@zed.dev >
2023-11-09 18:43:26 +01:00
Nate Butler and Marshall Bowers
9cc3ee9674
Update usages of text_size_* to text_ui in ui components
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-08 15:28:38 -05:00
Conrad Irwin
496518f3e8
Use gpui instead of gpui2 consistenytly
2023-11-06 11:50:33 -07:00
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
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
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
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
bb35583998
Merge branch 'gpui2' into zed2
2023-10-24 14:11:13 +02:00
Marshall Bowers
6a532af1fd
Swap the parameters to IconButton
2023-10-24 11:26:19 +02:00
Marshall Bowers
47f979d457
Pass IDs to IconButtons instead of generating them
2023-10-24 11:20:31 +02:00
Antonio Scandurra
e4fe9538d7
Checkpoint
2023-10-21 16:01:47 +02:00
Antonio Scandurra
296fc92721
Checkpoint
2023-10-19 23:47:32 +02:00
Antonio Scandurra
21b4ae3fdc
Merge
2023-10-19 23:40:38 +02:00
Antonio Scandurra
dd7e1c505c
Checkpoint
2023-10-19 23:00:19 +02:00
Marshall Bowers
94f0140f62
Assign each IconButton an ID based on the icon
2023-10-19 16:50:33 -04:00
Marshall Bowers
92542e6b94
Identify IconButton
2023-10-19 16:12:21 -04:00
Marshall Bowers
3932c1064e
Merge branch 'gpui2' into gpui2-theme-to-color
2023-10-19 16:10:44 -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
61e09ff532
Checkpoint: Thread WindowContext through to user_settings
2023-10-19 12:58:17 -04:00
Nate Butler
65828c14fc
Use ui_size to build icon button
2023-10-18 19:12:02 -04:00
Antonio Scandurra
296a2b8e5d
Rename fill to bg
2023-10-18 09:39:23 +02:00
Antonio Scandurra
4db0350f06
Checkpoint
2023-10-17 22:16:48 +02:00
Marshall Bowers
262f5886a4
Checkpoint
2023-10-12 12:18:35 -04:00
Marshall Bowers
a6b872bb0c
Temporarily disable click handlers
2023-10-12 10:44:11 -04:00
Marshall Bowers
8cd112110e
Reconcile with upstream changes
2023-10-12 10:40:47 -04:00
Marshall Bowers
95ef61bc45
Thread click handler through from workspace to language selector
2023-10-10 18:02:08 -04:00
Marshall Bowers
be843227a1
Add on_click to IconButton
2023-10-10 17:26:33 -04:00
Marshall Bowers
8f7f38536d
Re-enable hover styles
2023-10-10 11:48:25 -04:00
Marshall Bowers
696aee3891
Add IconButton component
2023-10-06 17:16:00 -04:00
Conrad Irwin
Marshall Bowers
Antonio Scandurra
Nathan Sobo
Nate Butler
