oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Theme-able Vim Mode wrapper (#39813)

Browse Source 
Closes [#14093](https://github.com/zed-industries/zed/issues/14093)
Builds on [#32279](https://github.com/zed-industries/zed/pull/32279) by
making it theme dependent.
Discussion
[#37816](https://github.com/zed-industries/zed/discussions/37816)

Wraps the mode label indicator in a div and makes the wrapper and label
theme-able. Label weight to medium
Mode indicator will render like previously if not theme colors have been
set. (i.e., they match zed default- and fallbacks)
Really helps with visual confirmation of current mode.

_Did not investigate further if there is a way to keep the leading and
trailing -- if no theme var given._

Can be applied either by a theme itself or using `theme_overrides` in
settings.json

Theme colors applied via `theme_overrides`
<img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 08"
src="https://github.com/user-attachments/assets/a00d9ae4-b6db-46a0-84e2-98d2691a11ad"
/>
<img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 16"
src="https://github.com/user-attachments/assets/f27fddab-524d-43c4-9307-46b6a656cd35"
/>
<img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 23"
src="https://github.com/user-attachments/assets/7e477fff-7a40-4c01-95a7-fbd40fff6caa"
/>

No theme applied
<img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 31"
src="https://github.com/user-attachments/assets/8b7b2c75-007b-4074-a552-181c53f31213"
/>
<img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 36"
src="https://github.com/user-attachments/assets/7a708d81-2033-4d72-a844-57607a0434ea"
/>
<img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 40"
src="https://github.com/user-attachments/assets/526f9d10-4d0f-4bc5-af89-31fcca538ce4"
/>



https://github.com/user-attachments/assets/d0d71d4d-504f-4d18-bbd9-83d3a4b2adb7


Release Notes:

- Vim make mode indicator themeable

---------

Co-authored-by: willyHetland <willy.hetland@zeekit.no>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
Willy Hetland
2025-10-21 04:30:30 +00:00
committed by GitHub
co-authored by willyHetland Conrad Irwin
parent 917f22f884
commit 71ea133d72
6 changed files with 176 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/settings/src/settings_content/theme.rs
+29
View File
@@ -889,6 +889,35 @@ pub struct ThemeColorsContent {
/// Deprecated in favor of `version_control_conflict_marker_theirs`.
#[deprecated]
pub version_control_conflict_theirs_background: Option<String>,
/// Background color for Vim Normal mode indicator.
#[serde(rename = "vim.normal.background")]
pub vim_normal_background: Option<String>,
/// Background color for Vim Insert mode indicator.
#[serde(rename = "vim.insert.background")]
pub vim_insert_background: Option<String>,
/// Background color for Vim Replace mode indicator.
#[serde(rename = "vim.replace.background")]
pub vim_replace_background: Option<String>,
/// Background color for Vim Visual mode indicator.
#[serde(rename = "vim.visual.background")]
pub vim_visual_background: Option<String>,
/// Background color for Vim Visual Line mode indicator.
#[serde(rename = "vim.visual_line.background")]
pub vim_visual_line_background: Option<String>,
/// Background color for Vim Visual Block mode indicator.
#[serde(rename = "vim.visual_block.background")]
pub vim_visual_block_background: Option<String>,
/// Background color for Vim Helix Normal mode indicator.
#[serde(rename = "vim.helix_normal.background")]
pub vim_helix_normal_background: Option<String>,
/// Background color for Vim Helix Select mode indicator.
#[serde(rename = "vim.helix_select.background")]
pub vim_helix_select_background: Option<String>,
/// Text color for Vim mode indicator label.
#[serde(rename = "vim.mode.text")]
pub vim_mode_text: Option<String>,
}
#[skip_serializing_none]