`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
208 lines
7.7 KiB
Rust
208 lines
7.7 KiB
Rust
#![cfg_attr(target_family = "wasm", no_main)]
|
|
|
|
#[path = "example_support/fonts.rs"]
|
|
mod example_support;
|
|
|
|
use gpui::{
|
|
Anchor, AnchoredPositionMode, App, Axis, Bounds, Context, Half as _, InteractiveElement,
|
|
ParentElement, Pixels, Point, Render, SharedString, Size, Window, WindowBounds, WindowOptions,
|
|
anchored, deferred, div, point, prelude::*, px, rgb, size,
|
|
};
|
|
use gpui_platform::application;
|
|
|
|
struct AnchorDemo {
|
|
hovered_button: Option<usize>,
|
|
}
|
|
|
|
struct ButtonDemo {
|
|
label: SharedString,
|
|
corner: Option<Anchor>,
|
|
}
|
|
|
|
fn resolved_position(corner: Anchor, button_size: Size<Pixels>) -> Point<Pixels> {
|
|
let offset = Point {
|
|
x: px(0.),
|
|
y: -button_size.height,
|
|
};
|
|
|
|
offset
|
|
+ match corner.other_side_along(Axis::Vertical) {
|
|
Anchor::TopLeft => point(px(0.0), px(0.0)),
|
|
Anchor::TopCenter => point(button_size.width.half(), px(0.0)),
|
|
Anchor::TopRight => point(button_size.width, px(0.0)),
|
|
Anchor::LeftCenter => point(button_size.width, button_size.height.half()),
|
|
Anchor::RightCenter => point(px(0.), button_size.height.half()),
|
|
Anchor::BottomLeft => point(px(0.0), button_size.height),
|
|
Anchor::BottomCenter => point(button_size.width / 2.0, button_size.height),
|
|
Anchor::BottomRight => point(button_size.width, button_size.height),
|
|
}
|
|
}
|
|
|
|
impl AnchorDemo {
|
|
fn buttons() -> Vec<ButtonDemo> {
|
|
vec![
|
|
ButtonDemo {
|
|
label: "TopLeft".into(),
|
|
corner: Some(Anchor::TopLeft),
|
|
},
|
|
ButtonDemo {
|
|
label: "TopCenter".into(),
|
|
corner: Some(Anchor::TopCenter),
|
|
},
|
|
ButtonDemo {
|
|
label: "TopRight".into(),
|
|
corner: Some(Anchor::TopRight),
|
|
},
|
|
ButtonDemo {
|
|
label: "LeftCenter".into(),
|
|
corner: Some(Anchor::LeftCenter),
|
|
},
|
|
ButtonDemo {
|
|
label: "Center".into(),
|
|
corner: None,
|
|
},
|
|
ButtonDemo {
|
|
label: "RightCenter".into(),
|
|
corner: Some(Anchor::RightCenter),
|
|
},
|
|
ButtonDemo {
|
|
label: "BottomLeft".into(),
|
|
corner: Some(Anchor::BottomLeft),
|
|
},
|
|
ButtonDemo {
|
|
label: "BottomCenter".into(),
|
|
corner: Some(Anchor::BottomCenter),
|
|
},
|
|
ButtonDemo {
|
|
label: "BottomRight".into(),
|
|
corner: Some(Anchor::BottomRight),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
impl Render for AnchorDemo {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let buttons = Self::buttons();
|
|
let button_size = size(px(120.0), px(65.0));
|
|
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.size_full()
|
|
.items_center()
|
|
.justify_center()
|
|
.bg(gpui::white())
|
|
.gap_4()
|
|
.p_10()
|
|
.child("Popover with Anchor")
|
|
.child(
|
|
div()
|
|
.size_128()
|
|
.grid()
|
|
.grid_cols(3)
|
|
.gap_6()
|
|
.relative()
|
|
.children(buttons.iter().enumerate().map(|(index, button)| {
|
|
let is_hovered = self.hovered_button == Some(index);
|
|
let is_hoverable = button.corner.is_some();
|
|
div()
|
|
.relative()
|
|
.child(
|
|
div()
|
|
.id(("button", index))
|
|
.w(button_size.width)
|
|
.h(button_size.height)
|
|
.flex()
|
|
.items_center()
|
|
.justify_center()
|
|
.bg(gpui::white())
|
|
.when(is_hoverable, |this| {
|
|
this.border_1()
|
|
.rounded_lg()
|
|
.border_color(gpui::black())
|
|
.hover(|style| {
|
|
style.bg(gpui::black()).text_color(gpui::white())
|
|
})
|
|
.on_hover(cx.listener(
|
|
move |this, hovered, _window, cx| {
|
|
if *hovered {
|
|
this.hovered_button = Some(index);
|
|
} else if this.hovered_button == Some(index) {
|
|
this.hovered_button = None;
|
|
}
|
|
cx.notify();
|
|
},
|
|
))
|
|
.child(button.label.clone())
|
|
}),
|
|
)
|
|
.when_some(self.hovered_button.filter(|_| is_hovered), |this, index| {
|
|
let button = &buttons[index];
|
|
let Some(corner) = button.corner else {
|
|
return this;
|
|
};
|
|
|
|
let position = resolved_position(corner, button_size);
|
|
this.child(deferred(
|
|
anchored()
|
|
.anchor(corner)
|
|
.position(position)
|
|
.position_mode(AnchoredPositionMode::Local)
|
|
.snap_to_window()
|
|
.child(
|
|
div()
|
|
.py_0p5()
|
|
.px_2()
|
|
.bg(gpui::black().opacity(0.75))
|
|
.text_color(rgb(0xffffff))
|
|
.rounded_sm()
|
|
.shadow_sm()
|
|
.min_w(px(100.0))
|
|
.text_sm()
|
|
.child(button.label.clone()),
|
|
),
|
|
))
|
|
})
|
|
})),
|
|
)
|
|
}
|
|
}
|
|
|
|
fn run_example() {
|
|
application().run(|cx: &mut App| {
|
|
if !example_support::load_fonts(cx) {
|
|
return;
|
|
}
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(WindowBounds::Windowed(Bounds::centered(
|
|
None,
|
|
size(px(750.), px(600.)),
|
|
cx,
|
|
))),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| AnchorDemo {
|
|
hovered_button: None,
|
|
})
|
|
},
|
|
)
|
|
.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();
|
|
}
|