Skip to content

fix: patch dark theme danger colors for window titlebar close button #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Z7K9T2Y5X8V4N1Q6P0M3L8R2S9W5H1G7J4D6C0F wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: patch dark theme danger colors for window titlebar close button #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

use std::rc::Rc;

use gpui_kit::App;
use gpui_kit::component::{Theme, ThemeConfig, ThemeRegistry};
use gpui_kit::component::{Theme, ThemeConfig, ThemeMode, ThemeRegistry};
use gpui_kit::{App, rgb, white};
use serde::{Deserialize, Serialize};

use crate::settings::Settings;
Expand Down Expand Up @@ -35,7 +35,13 @@ pub enum Accent {
}

impl Accent {
pub const ALL: [Accent; 5] = [Accent::Blue, Accent::Violet, Accent::Teal, Accent::Amber, Accent::Rose];
pub const ALL: [Accent; 5] = [
Accent::Blue,
Accent::Violet,
Accent::Teal,
Accent::Amber,
Accent::Rose,
];

/// 0xRRGGBB
pub fn rgb(self) -> u32 {
Expand All @@ -57,8 +63,22 @@ pub fn apply(cx: &mut App) {
ThemeChoice::Light => ThemeRegistry::global(cx).default_light_theme().clone(),
ThemeChoice::Dimmed => Rc::new(dimmed(settings.accent)),
};

Theme::update(cx, |theme| theme.apply_config(&config));
patch_dark_danger_colors(config.mode, cx);
crate::shell::set_menu_theme(config.mode.is_dark());
cx.refresh_windows();
}

/// Workaround for gpui-component's default dark theme, where the window
/// TitleBar close button renders with abnormal danger colors on hover.
fn patch_dark_danger_colors(theme_mode: ThemeMode, cx: &mut App) {
if matches!(theme_mode, ThemeMode::Dark) {
let theme = Theme::global_mut(cx);
theme.colors.danger_foreground = white();
theme.colors.danger = rgb(0x00e8_1123).into();
theme.colors.danger_active = rgb(0x8b_0a_14).into();
}
}

/// Blue-grey dark theme, in gpui-component's theme file format. Colors that are not
Expand Down