Commit Graph
34 Commits
Author SHA1 Message Date
Marshall Bowers 72d060108d Make indexing into ColorScales safe (#3205)
This PR makes indexing into `ColorScale`s safe by constraining the
`ColorScaleStep`s to a set of known values.

Release Notes:

- N/A
2023-11-01 21:52:42 -04:00
Marshall Bowers 69aafe9ff6 Adjust ColorScale representation (#3204)
This PR adjusts the representations of `ColorScale`s to allow us to
remove an unsafe `From` impl when converting from the statically-defined
representation of the scale.

Release Notes:

- N/A
2023-11-01 21:10:50 -04: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
Marshall Bowers bbe53895ef Return ColorScaleSets from individual color scale functions (#3197)
This PR adjusts the individual color scale functions to return
`ColorScaleSet`s instead of `DefaultColorScaleSet`s.

We only use the `DefaultColorScaleSet`s to simplify the construction of
the scales, so it isn't necessary to surface them outside of the
function.

Release Notes:

-  N/A
2023-11-01 10:45:42 -04:00
Marshall Bowers 272f856460 Use Refineable for ThemeStyles (#3196)
This PR updates the `ThemeStyles` struct to use the `Refineable` trait
instead of a custom declarative macro for generating refinements.

Release Notes:

- N/A
2023-10-31 23:33:51 -04:00
Marshall Bowers 36a73d657a Remove old Theme definition (#3195)
This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.

The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.

This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:

https://github.com/zed-industries/zed/blob/18431051d9d750d9e66284a71f7a55a1e31c1374/crates/language2/src/highlight_map.rs#L15-L41
2023-10-31 23:05:50 -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
Julia db34de6be4 Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Marshall Bowers 49571127da theme2: Correctly reference the dark alpha scale 2023-10-30 17:35:13 -04:00
Marshall Bowers a02d806715 Add a story showcasing the color scales 2023-10-30 17:31:15 -04:00
Marshall Bowers 991f58409e Fix alpha channel values for color scales 2023-10-30 17:20:43 -04:00
Marshall Bowers e0f68c77b0 Add type alias for steps in color scales 2023-10-30 17:08:37 -04:00
Marshall Bowers b128377cd2 Register all of the color scales 2023-10-30 17:03:33 -04:00
Marshall Bowers ccccf84867 Define all color scales 2023-10-30 17:00:46 -04:00
Marshall Bowers 7841a56a11 Start work on defining color scales 2023-10-30 16:21:59 -04:00
Marshall Bowers ba789fc0c4 Remove old theme constructs 2023-10-30 14:47:44 -04:00
Marshall Bowers d3cd5f3ec5 Format theme2 2023-10-30 11:26:30 -04:00
Marshall Bowers 3d8516b25f Convert all themes 2023-10-30 11:22:04 -04:00
Marshall Bowers 2879d231b1 Revert changes to themes 2023-10-30 11:06:45 -04:00
Marshall Bowers 3591ffe4a7 Emit all themes at once 2023-10-30 11:04:03 -04:00
Marshall Bowers 560e115656 Pull syntax colors from JSON theme 2023-10-26 17:06:05 +02:00
Max BrunsfeldandMarshall 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
Conrad Irwin 07b9ec29e6 Revert "Fix settings2 crate tests"
This reverts commit 6e9c779c51.
2023-10-26 11:33:58 +02:00
Conrad Irwin 6e9c779c51 Fix settings2 crate tests 2023-10-26 11:27:23 +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 c8a86c2dd1 theme2: Add Rosé Pine themes 2023-10-25 17:38:48 +02:00
Marshall Bowers cee8175c19 theme2: Add Sandcastle theme 2023-10-25 17:27:25 +02:00
Marshall Bowers 437d147935 Rename player to players 2023-10-25 16:39: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 4ca7ddfc42 Finish up ThemeRegistry and remove AnyAssetSource 2023-10-24 17:47:41 +02:00
Marshall Bowers 4740d6ed61 Checkpoint 2023-10-24 17:29:03 +02:00
Marshall Bowers 09866ec3e9 WIP 2023-10-24 16:59:24 +02:00
Antonio Scandurra 56462ef793 Checkpoint 2023-10-23 10:59:29 +02:00