reya/coop
1
0
Fork 1
Code Issues Pull Requests Releases 5 Activity

migrate theming to gpui-native-kit

Browse Source
This commit is contained in:
reya
2026-11-09 21:33:20 +07:00
parent 688b1ce418
commit 8e8ceaf2db
11 changed files with 278 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/Cargo.toml
+2 -4
View File
@@ -47,13 +47,11 @@ person = { path = "../crates/person" }
gpui.workspace = true
gpui_platform.workspace = true
gpui-kit.workspace = true
gpui_linux.workspace = true
gpui_windows.workspace = true
gpui_macos.workspace = true
native-theme.workspace = true
native-theme-gpui.workspace = true
flume.workspace = true
gpui-native-kit.workspace = true
speech = { path = "../crates/speech" }
reqwest_client.workspace = true
log.workspace = true
desktop/src/main.rs
+21 -90
View File
@@ -2,18 +2,14 @@ use std::sync::{Arc, Mutex};
use chat_ui::ToggleDictation;
use gpui::{
App, Bounds, Global, KeyBinding, Menu, MenuItem, SharedString, TitlebarOptions,
WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind, WindowOptions,
actions, point, px, size,
App, Bounds, KeyBinding, Menu, MenuItem, SharedString, TitlebarOptions, WindowBounds,
WindowDecorations, WindowKind, WindowOptions, actions, point, px, size,
};
use gpui_kit::component::{Theme, ThemeMode};
use gpui_native_kit::theme::ActiveTheme;
use gpui_platform::application;
use native_theme::watch::ThemeSubscription;
use native_theme_gpui::apply_system_theme;
use nostr_sdk::prelude::SecretKey;
use settings::{AppSettings, AppearanceMode};
use state::{APP_ID, CLIENT_NAME};
use workspace::TAB_BAR_HEIGHT;
use workspace::{TAB_BAR_HEIGHT, apply_appearance_mode};
actions!(coop, [Quit]);
@@ -34,8 +30,9 @@ fn main() {
.with_assets(assets::CombinedAssets)
.with_http_client(Arc::new(reqwest_client::ReqwestClient::new()))
.run(move |cx| {
// Initialize the framework before anything renders
gpui_kit::init(cx);
// Initialize the frameworks before anything renders
gpui_native_kit::init(cx);
speech::init_compat(cx);
// Load embedded fonts in assets/fonts
load_embedded_fonts(cx);
@@ -71,14 +68,7 @@ fn main() {
settings::init(cx);
let appearance = settings::persisted_appearance_mode();
let font_size = settings::persisted_theme().font_size;
if let Err(error) = apply_native_theme(appearance, font_size, cx) {
log::warn!("native theme unavailable ({error})");
apply_appearance(appearance, cx);
AppSettings::apply_theme_style(cx);
}
start_theme_watcher(cx);
apply_appearance_mode(appearance, cx);
// Initialize the nostr client
state::init(cx, cli_key);
@@ -110,7 +100,7 @@ fn main() {
// Set up the window options
let opts = WindowOptions {
window_background: WindowBackgroundAppearance::Opaque,
window_background: cx.theme().window_background,
window_decorations: Some(WindowDecorations::Client),
window_bounds: Some(WindowBounds::Windowed(bounds)),
kind: WindowKind::Normal,
@@ -127,8 +117,18 @@ fn main() {
..Default::default()
};
gpui_kit::open_window(opts, cx, workspace::init)
.expect("Failed to open window. Please restart the application.");
cx.open_window(opts, |window, cx| {
gpui_native_kit::theme::Theme::sync_from_window(window, cx);
gpui_native_kit::theme::Theme::sync_window_rem_size(window, cx);
window
.observe_window_appearance(|window, cx| {
gpui_native_kit::theme::Theme::sync_from_window(window, cx);
cx.refresh_windows();
})
.detach();
workspace::init(window, cx)
})
.expect("Failed to open window. Please restart the application.");
cx.activate(true);
});
@@ -181,72 +181,3 @@ fn quit(_ev: &Quit, cx: &mut App) {
log::info!("Gracefully quitting the application . . .");
cx.quit();
}
/// Apply the native theme to the app, scaled to the user's font size,
/// then layer the persisted theme tuning on top
fn apply_native_theme(
appearance: AppearanceMode,
font_size: f32,
cx: &mut App,
) -> native_theme::Result<()> {
let mut system = native_theme_gpui::SystemTheme::from_system()?;
let native = system.light.defaults.font.size;
if native > 0.0 {
system.accessibility.text_scaling_factor *= font_size / native;
}
apply_system_theme(&system, cx);
apply_appearance(appearance, cx);
// Applying the native theme replaces the whole theme, so the user's
// tuning must be layered on afterwards.
AppSettings::apply_theme_style(cx);
Ok(())
}
/// Honor the appearance mode against the installed (native) palettes
fn apply_appearance(appearance: AppearanceMode, cx: &mut App) {
match appearance {
AppearanceMode::System => Theme::sync_system_appearance(None, cx),
AppearanceMode::Light => Theme::change(ThemeMode::Light, None, cx),
AppearanceMode::Dark => Theme::change(ThemeMode::Dark, None, cx),
}
}
/// Holds the watcher subscription so it lives as long as the app.
struct ThemeWatcher {
_subscription: ThemeSubscription,
}
impl Global for ThemeWatcher {}
/// Start a background task to watch for OS theme changes and re-apply the native theme.
fn start_theme_watcher(cx: &mut App) {
let (sender, receiver) = flume::unbounded();
match native_theme::watch::on_theme_change(move |event| {
if let Err(error) = sender.send(event) {
log::warn!("theme change dropped ({error})");
}
}) {
Ok(subscription) => {
cx.set_global(ThemeWatcher {
_subscription: subscription,
});
cx.spawn(async move |cx| {
while receiver.recv_async().await.is_ok() {
log::info!("OS theme changed; re-applying");
cx.update(|cx| {
let appearance = AppSettings::get_appearance_mode(cx);
let font_size = AppSettings::get_theme(cx).font_size;
if let Err(error) = apply_native_theme(appearance, font_size, cx) {
log::warn!("failed to apply updated OS theme ({error})");
}
});
}
})
.detach();
}
Err(error) => log::warn!("OS theme watching unavailable ({error})"),
}
}