oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,153 Commits 1 Branch 0 Tags
4b40e83b8b3cf8e18b422d2ad22a2631c16a7083
Commit Graph
50 Commits
Author SHA1 Message Date
Andrew LyginandMarshall Bowers a0f236af5d themes: Add pane_group.border color (#9986) 
This PR adds the `pane_group.border` theme attribute that defines the
color of the borders between pane groups.

- Defaults to the `border` color, so nothing changes in the existing
themes.
- VSCode theme converter takes it from the `editorGroup.border`.

The borders marked by red are affected:

<img width="878" alt="pane_group_borders"
src="https://github.com/zed-industries/zed/assets/2101250/54b9fd39-b3e1-4898-a047-ee0b6ec953ed">

Release Notes:

- Added `pane_group.border` to the theme for modifying the border color
for panes within a pane group.

Related Issues:

- First discussed in
https://github.com/zed-industries/zed/pull/9754#issuecomment-2026497213

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
 2024-04-01 12:07:26 -04:00
jansolLuiz MarcondesMarshall Bowers
 		49144d94bf gpui: Add support for window transparency & blur on macOS (#9610) 
This PR adds support for transparent and blurred window backgrounds on
macOS.

Release Notes:

- Added support for transparent and blurred window backgrounds on macOS
([#5040](https://github.com/zed-industries/zed/issues/5040)).
- This requires themes to specify a new `background.appearance` key
("opaque", "transparent" or "blurred") and to include an alpha value in
colors that should be transparent.

<img width="913" alt="image"
src="https://github.com/zed-industries/zed/assets/2588851/7547ee2a-e376-4d55-9114-e6fc2f5110bc">
<img width="994" alt="image"
src="https://github.com/zed-industries/zed/assets/2588851/b36fbc14-6e4d-4140-9448-69cad803c45a">
<img width="1020" alt="image"
src="https://github.com/zed-industries/zed/assets/2588851/d70e2005-54fd-4991-a211-ed484ccf26ef">

---------

Co-authored-by: Luiz Marcondes <luizgustavodevergennes@gmail.com>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
 2024-03-29 11:10:47 -04:00
Marshall Bowers 5d0c144ce7 theme_importer: Define more colors in VsCodeTheme (#6960) 
This PR extends the `VsCodeTheme` struct with more of the colors
available on a VS Code theme.

Release Notes:

- N/A
 2024-01-28 21:55:40 -05:00
Marshall Bowers 3eb0a2c3c7 theme_importer: Map more colors (#6913) 
This PR extends the `theme_importer` to map more colors from VS Code
themes.

Release Notes:

- N/A
 2024-01-27 23:38:07 -05:00
Marshall Bowers 9b453d2cbc Remove old themes using UserTheme constructs (#6897) 
This PR removes the themes defined using the `UserTheme` types, as we're
now loading the themes via JSON.

The `theme_importer` has also been reworked to read in a VS Code theme
and output a new JSON theme.

Release Notes:

- N/A
 2024-01-27 16:55:37 -05:00
Marshall Bowers e5148b4a1b Assign player colors from the theme (#3805) 
This PR updates the `theme_importer` to pull in the player colors so
that we can assign them based on the current theme.

Release Notes:

- N/A
 2023-12-22 22:28:41 -05:00
Marshall Bowers 80143b2571 Fix names for Rosé Pine themes (#3771) 
This PR fixes the names of the Rosé Pine themes.

We want to keep the Unicode "é" in the theme name, both because this is
the actual name of the theme, and also to maintain parity with Zed1.

Release Notes:

- N/A
 2023-12-21 22:45:29 -05:00
Marshall Bowers afcf6c6852 Map textLink.activeForeground from VS Code to link_text_hover 2023-12-19 18:29:27 -05:00
Nate Butler da7628cc1e Style wrap guides for imported themes 2023-12-18 11:16:22 -05:00
Marshall Bowers 292fac37bb Use editor.foreground from VS Code for the editor foreground 2023-12-14 17:30:37 -05:00
Marshall Bowers 8bac4e199d Emit editor_foreground color from theme converter 2023-12-14 17:28:45 -05:00
Marshall Bowers 3120a9cbea theme_importer: Fall back to inactive tab background if no active tab background set (#3598) 
This PR makes it so the `theme_importer` falls back to the inactive tab
background color if the theme doesn't not an active tab background
color.

This fixes the active tab color in the Synthwave 84 theme.

Release Notes:

- N/A
 2023-12-11 17:39:46 -05:00
Marshall Bowers e271bbe896 Use editorOverviewRuler.border for the scrollbar track border 2023-12-11 16:54:53 -05:00
Marshall Bowers dfd1b5aa11 Use the editor background for the scrollbar track background 2023-12-11 16:39:26 -05:00
Marshall Bowers 41f55e4d0d Use tab.inactiveForeground from VS Code for muted text color (#3593) 
This PR updates the `theme_importer` to pull in the
`tab.inactiveForeground` color from VS Code to use as the muted text
color.

Release Notes:

- N/A
 2023-12-11 15:57:47 -05:00
Marshall Bowers fe46459982 Pull more scrollbar colors from VS Code 2023-12-11 12:59:03 -05:00
Marshall Bowers 3271cf1030 Map scrollbar colors from VS Code themes 2023-12-11 12:49:54 -05:00
Marshall Bowers 008c56a09b Adjust which status colors we import from the VS Code theme (#3570) 
This PR adjusts the status colors we import from the VS Code theme to be
the right ones.

Instead of looking at the Git status colors, we use the
`editorGutter.addedBackground`, `editorGutter.modifiedBackground`, and
`editorGutter.deletedBackground` colors for added, modified, and deleted
status colors, respectively.

Release Notes:

- N/A
 2023-12-08 17:56:25 -05:00
Marshall Bowers 2517b1017b Weight scope matches to improve results 2023-12-08 16:35:54 -05:00
Marshall Bowers 2ef3954700 Fix function colors in Gruvbox themes 2023-12-08 16:04:58 -05:00
Marshall Bowers 27501d2929 Pull in colors for selected ghost elements 2023-12-08 14:19:56 -05:00
Marshall Bowers 77c8108f9b Use dropdown.background from VS Code for elevated surface background 2023-12-08 14:13:50 -05:00
Marshall Bowers 1c850f495c Use breadcrumb.background from VS Code for toolbar background (#3559) 
This PR changes the color we use for the toolbar background from the VS
Code theme to `breadcrumb.background`.

If this value isn't set then we fall back to the `editor.background`.

Release Notes:

- N/A
 2023-12-08 14:03:18 -05:00
Marshall Bowers 1d35a815a6 Use editorGroupHeader.tabsBackground from VS Code as tab bar background (#3558) 
This PR changes the color we use for the tab bar background from the VS
Code theme to `editorGroupHeader.tabsBackground`.

Release Notes:

- N/A
 2023-12-08 13:50:56 -05:00
Marshall Bowers 62155f3a88 Add fallback to constant tokens for numbers 2023-12-08 13:20:00 -05:00
Marshall Bowers ab5b76e943 Pull Git status colors from VS Code themes 2023-12-08 13:14:22 -05:00
Marshall Bowers a5a0ad8b5c Add missing serde attribute to foreground 2023-12-08 13:13:19 -05:00
Marshall Bowers 9ac9532d3d Treat empty strings as None when deserializing VS Code themes 2023-12-08 13:12:09 -05:00
Marshall Bowers 6f064cfc36 Improve matching for constructor tokens 2023-12-08 11:34:39 -05:00
Marshall Bowers 6634a5e9f6 Improve matching for constant tokens further 2023-12-08 11:23:42 -05:00
Marshall Bowers 1b6721170a Improve matching for constant tokens 2023-12-08 11:21:40 -05:00
Marshall Bowers 63ce7cd407 Improve matching for preprocessor tokens 2023-12-08 11:17:05 -05:00
Marshall Bowers 40a95221ea Improve matching for string tokens 2023-12-08 11:13:28 -05:00
Marshall Bowers a8a5b9524d Improve matching for punctuation tokens 2023-12-08 11:07:52 -05:00
Marshall Bowers 53d77b192a Don't match support.function for function 2023-12-08 10:48:27 -05:00
Marshall Bowers 7a9f764aa0 Add support for theme family-specific syntax mapping overrides (#3551) 
This PR adds support for adding a specific set of mappings from Zed
syntax tokens to VS Code scopes for a particular theme family.

We can use this as a fallback when we aren't otherwise able to rely on
the mappings in the theme importer, as sometimes it isn't possible to
make a specific enough matcher that works across all of the themes.

Release Notes:

- N/A
 2023-12-07 23:37:49 -05:00
Marshall Bowers efb4ff816a Set tab bar and toolbar backgrounds 2023-12-07 22:32:41 -05:00
Marshall Bowers a88372dc99 Set background colors for title and status bars 2023-12-07 22:24:10 -05:00
Marshall Bowers f272881a6b theme_importer: Improve syntax token matching (#3549) 
This PR improves the approach we use to match syntax tokens between Zed
and VS Code in the `theme_importer`.

We now use the list of scopes assigned to each Zed syntax token to rank
the possible candidates in the VS Code and then pick the candidate with
the highest rank.

So far this has proved to provide better colors across the board, but
we'll continue to refine the matching over time.

Release Notes:

- N/A
 2023-12-07 22:11:31 -05:00
Marshall Bowers c7e19c0bcd Emit accurate hex colors in generated themes (#3547) 
This PR fixes an issues where the hex colors in the generated themes
were not correct.

We're using the [`palette`](https://crates.io/crates/palette) crate to
perform the conversions, as this gives us accurate hex codes that match
the VS Code source themes.

Release Notes:

- N/A
 2023-12-07 18:34:03 -05:00
Marshall Bowers fa223e0c6f Pull editor inlay hints from VS Code themes 2023-12-07 15:36:13 -05:00
Marshall Bowers 6a164db700 Rename members in ZedSyntaxToken 2023-12-07 14:35:58 -05:00
Marshall Bowers 8ed04fe798 Remove commented-out code in theme importer 2023-12-07 14:33:37 -05:00
Nate Butler 024fb4f818 Remove unused import 2023-11-09 16:41:58 -05:00
Nate Butler 4cd37e6e62 Extend theme converter to allow multimatching against vscode colors 2023-11-09 16:38:48 -05:00
Nate ButlerandMarshall Bowers 1c6a960bbf Deal with special case where a VSCode theme doesn't have a foreground color 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 14:53:04 -05:00
Nate ButlerandMarshall Bowers 54157eb99a Finish passing Syntax from VSCode themes to Zed Themes 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 14:41:26 -05:00
Nate ButlerandMarshall Bowers ff053890cf Extend UserSyntax to allow font_style and font_weight to be specified 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-09 13:46:08 -05:00
Marshall Bowers 978cff8095 Use IndexMap for a deterministic order when importing syntax colors 2023-11-09 13:12:36 -05:00
Marshall Bowers 1f0fccc353 Reorganize theme_importer 2023-11-09 13:07:32 -05:00