Lukas Wirth
ab1c37a4ef
`gpui_web` currently embeds IBM Plex Sans and Lilex into every browser application during platform construction. Applications such as Delta already provide their own fonts, so those binaries contain overlapping font bundles and register the same faces twice. This change starts the web platform with an empty font database, matching the ownership boundary used by native applications: the application selects and registers its fonts before opening a window. Delta already follows that sequence. GPUI's browser-capable examples now load the former eight-face bundle explicitly through shared example support, while the standalone `hello_web` example demonstrates registering a minimal application font directly. Testing performed: - `cargo check -p gpui --examples --target wasm32-unknown-unknown` - `cargo check -p gpui --examples` - `cargo check -p gpui_web --target wasm32-unknown-unknown` - `cargo check --manifest-path crates/gpui_web/examples/hello_web/Cargo.toml --target wasm32-unknown-unknown` - `./script/clippy -p gpui_web --target wasm32-unknown-unknown` - `cargo fmt -p gpui -p gpui_web --check` Release Notes: - N/A
137 lines
4.3 KiB
Rust
137 lines
4.3 KiB
Rust
#![cfg_attr(target_family = "wasm", no_main)]
|
|
|
|
#[path = "example_support/fonts.rs"]
|
|
mod example_support;
|
|
|
|
use gpui::{
|
|
App, AppContext, Bounds, Context, Window, WindowBounds, WindowOptions, div, linear_color_stop,
|
|
linear_gradient, pattern_slash, prelude::*, px, rgb, size,
|
|
};
|
|
use gpui_platform::application;
|
|
|
|
struct PatternExample;
|
|
|
|
impl Render for PatternExample {
|
|
fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.gap_3()
|
|
.bg(rgb(0xffffff))
|
|
.size(px(600.0))
|
|
.justify_center()
|
|
.items_center()
|
|
.shadow_lg()
|
|
.text_xl()
|
|
.text_color(rgb(0x000000))
|
|
.child("Pattern Example")
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.border_1()
|
|
.border_color(gpui::blue())
|
|
.child(div().w(px(54.0)).h(px(18.0)).bg(pattern_slash(
|
|
gpui::red(),
|
|
18.0 / 4.0,
|
|
18.0 / 4.0,
|
|
)))
|
|
.child(div().w(px(54.0)).h(px(18.0)).bg(pattern_slash(
|
|
gpui::red(),
|
|
18.0 / 4.0,
|
|
18.0 / 4.0,
|
|
)))
|
|
.child(div().w(px(54.0)).h(px(18.0)).bg(pattern_slash(
|
|
gpui::red(),
|
|
18.0 / 4.0,
|
|
18.0 / 4.0,
|
|
)))
|
|
.child(div().w(px(54.0)).h(px(18.0)).bg(pattern_slash(
|
|
gpui::red(),
|
|
18.0 / 4.0,
|
|
18.0 / 2.0,
|
|
))),
|
|
)
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.border_1()
|
|
.border_color(gpui::blue())
|
|
.bg(gpui::green().opacity(0.16))
|
|
.child("Elements the same height should align")
|
|
.child(div().w(px(256.0)).h(px(56.0)).bg(pattern_slash(
|
|
gpui::red(),
|
|
56.0 / 6.0,
|
|
56.0 / 6.0,
|
|
)))
|
|
.child(div().w(px(256.0)).h(px(56.0)).bg(pattern_slash(
|
|
gpui::green(),
|
|
56.0 / 6.0,
|
|
56.0 / 6.0,
|
|
)))
|
|
.child(div().w(px(256.0)).h(px(56.0)).bg(pattern_slash(
|
|
gpui::blue(),
|
|
56.0 / 6.0,
|
|
56.0 / 6.0,
|
|
)))
|
|
.child(div().w(px(256.0)).h(px(26.0)).bg(pattern_slash(
|
|
gpui::yellow(),
|
|
56.0 / 6.0,
|
|
56.0 / 6.0,
|
|
))),
|
|
)
|
|
.child(
|
|
div()
|
|
.border_1()
|
|
.border_color(gpui::blue())
|
|
.w(px(240.0))
|
|
.h(px(40.0))
|
|
.bg(gpui::red()),
|
|
)
|
|
.child(
|
|
div()
|
|
.border_1()
|
|
.border_color(gpui::blue())
|
|
.w(px(240.0))
|
|
.h(px(40.0))
|
|
.bg(linear_gradient(
|
|
45.,
|
|
linear_color_stop(gpui::red(), 0.),
|
|
linear_color_stop(gpui::blue(), 1.),
|
|
)),
|
|
)
|
|
}
|
|
}
|
|
|
|
fn run_example() {
|
|
application().run(|cx: &mut App| {
|
|
if !example_support::load_fonts(cx) {
|
|
return;
|
|
}
|
|
let bounds = Bounds::centered(None, size(px(600.0), px(600.0)), cx);
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(WindowBounds::Windowed(bounds)),
|
|
..Default::default()
|
|
},
|
|
|_window, cx| cx.new(|_cx| PatternExample),
|
|
)
|
|
.unwrap();
|
|
|
|
cx.activate(true);
|
|
});
|
|
}
|
|
|
|
#[cfg(not(target_family = "wasm"))]
|
|
fn main() {
|
|
run_example();
|
|
}
|
|
|
|
#[cfg(target_family = "wasm")]
|
|
#[wasm_bindgen::prelude::wasm_bindgen(start)]
|
|
pub fn start() {
|
|
gpui_platform::web_init();
|
|
run_example();
|
|
}
|