`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
241 lines
7.6 KiB
Rust
241 lines
7.6 KiB
Rust
#![cfg_attr(target_family = "wasm", no_main)]
|
|
|
|
#[path = "example_support/fonts.rs"]
|
|
mod example_support;
|
|
|
|
use gpui::{
|
|
App, Bounds, Context, DisplayId, Hsla, Pixels, SharedString, Size, Window,
|
|
WindowBackgroundAppearance, WindowBounds, WindowKind, WindowOptions, div, point, prelude::*,
|
|
px, rgb,
|
|
};
|
|
use gpui_platform::application;
|
|
|
|
struct WindowContent {
|
|
text: SharedString,
|
|
bounds: Bounds<Pixels>,
|
|
bg: Hsla,
|
|
}
|
|
|
|
impl Render for WindowContent {
|
|
fn render(&mut self, window: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
|
|
let window_bounds = window.bounds();
|
|
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.bg(self.bg)
|
|
.size_full()
|
|
.items_center()
|
|
.text_color(rgb(0xffffff))
|
|
.child(self.text.clone())
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.text_sm()
|
|
.items_center()
|
|
.size_full()
|
|
.child(format!(
|
|
"origin: {}, {} size: {}, {}",
|
|
self.bounds.origin.x,
|
|
self.bounds.origin.y,
|
|
self.bounds.size.width,
|
|
self.bounds.size.height
|
|
))
|
|
.child(format!(
|
|
"cx.bounds() origin: {}, {} size {}, {}",
|
|
window_bounds.origin.x,
|
|
window_bounds.origin.y,
|
|
window_bounds.size.width,
|
|
window_bounds.size.height
|
|
)),
|
|
)
|
|
}
|
|
}
|
|
|
|
fn build_window_options(display_id: DisplayId, bounds: Bounds<Pixels>) -> WindowOptions {
|
|
WindowOptions {
|
|
// Set the bounds of the window in screen coordinates
|
|
window_bounds: Some(WindowBounds::Windowed(bounds)),
|
|
// Specify the display_id to ensure the window is created on the correct screen
|
|
display_id: Some(display_id),
|
|
titlebar: None,
|
|
window_background: WindowBackgroundAppearance::Transparent,
|
|
focus: false,
|
|
show: true,
|
|
kind: WindowKind::PopUp,
|
|
is_movable: false,
|
|
app_id: None,
|
|
window_min_size: None,
|
|
window_decorations: None,
|
|
tabbing_identifier: None,
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
fn run_example() {
|
|
application().run(|cx: &mut App| {
|
|
if !example_support::load_fonts(cx) {
|
|
return;
|
|
}
|
|
// Create several new windows, positioned in the top right corner of each screen
|
|
let size = Size {
|
|
width: px(350.),
|
|
height: px(75.),
|
|
};
|
|
let margin_offset = px(150.);
|
|
|
|
for screen in cx.displays() {
|
|
let bounds = Bounds {
|
|
origin: point(margin_offset, margin_offset),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Top Left {:?}", screen.id()).into(),
|
|
bg: gpui::red(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: screen.bounds().top_right()
|
|
- point(size.width + margin_offset, -margin_offset),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Top Right {:?}", screen.id()).into(),
|
|
bg: gpui::red(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: screen.bounds().bottom_left()
|
|
- point(-margin_offset, size.height + margin_offset),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Bottom Left {:?}", screen.id()).into(),
|
|
bg: gpui::blue(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: screen.bounds().bottom_right()
|
|
- point(size.width + margin_offset, size.height + margin_offset),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Bottom Right {:?}", screen.id()).into(),
|
|
bg: gpui::blue(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: point(screen.bounds().center().x - size.center().x, margin_offset),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Top Center {:?}", screen.id()).into(),
|
|
bg: gpui::black(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: point(margin_offset, screen.bounds().center().y - size.center().y),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Left Center {:?}", screen.id()).into(),
|
|
bg: gpui::black(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: point(
|
|
screen.bounds().center().x - size.center().x,
|
|
screen.bounds().center().y - size.center().y,
|
|
),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Center {:?}", screen.id()).into(),
|
|
bg: gpui::black(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: point(
|
|
screen.bounds().size.width - size.width - margin_offset,
|
|
screen.bounds().center().y - size.center().y,
|
|
),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Right Center {:?}", screen.id()).into(),
|
|
bg: gpui::black(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
|
|
let bounds = Bounds {
|
|
origin: point(
|
|
screen.bounds().center().x - size.center().x,
|
|
screen.bounds().size.height - size.height - margin_offset,
|
|
),
|
|
size,
|
|
};
|
|
|
|
cx.open_window(build_window_options(screen.id(), bounds), |_, cx| {
|
|
cx.new(|_| WindowContent {
|
|
text: format!("Bottom Center {:?}", screen.id()).into(),
|
|
bg: gpui::black(),
|
|
bounds,
|
|
})
|
|
})
|
|
.unwrap();
|
|
}
|
|
});
|
|
}
|
|
|
|
#[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();
|
|
}
|