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
356 lines
12 KiB
Rust
356 lines
12 KiB
Rust
#![cfg_attr(target_family = "wasm", no_main)]
|
|
|
|
#[path = "example_support/fonts.rs"]
|
|
mod example_support;
|
|
|
|
use gpui::{
|
|
App, Bounds, Context, KeyBinding, PromptButton, PromptLevel, Window, WindowBounds, WindowKind,
|
|
WindowOptions, actions, div, prelude::*, px, rgb, size,
|
|
};
|
|
use gpui_platform::application;
|
|
|
|
struct SubWindow {
|
|
custom_titlebar: bool,
|
|
is_dialog: bool,
|
|
}
|
|
|
|
fn button(text: &str, on_click: impl Fn(&mut Window, &mut App) + 'static) -> impl IntoElement {
|
|
div()
|
|
.id(text.to_string())
|
|
.flex_none()
|
|
.px_2()
|
|
.bg(rgb(0xf7f7f7))
|
|
.active(|this| this.opacity(0.85))
|
|
.border_1()
|
|
.border_color(rgb(0xe0e0e0))
|
|
.rounded_sm()
|
|
.cursor_pointer()
|
|
.child(text.to_string())
|
|
.on_click(move |_, window, cx| on_click(window, cx))
|
|
}
|
|
|
|
impl Render for SubWindow {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let window_bounds =
|
|
WindowBounds::Windowed(Bounds::centered(None, size(px(250.0), px(200.0)), cx));
|
|
|
|
div()
|
|
.flex()
|
|
.flex_col()
|
|
.bg(rgb(0xffffff))
|
|
.size_full()
|
|
.gap_2()
|
|
.when(self.custom_titlebar, |cx| {
|
|
cx.child(
|
|
div()
|
|
.flex()
|
|
.h(px(32.))
|
|
.px_4()
|
|
.bg(gpui::blue())
|
|
.text_color(gpui::white())
|
|
.w_full()
|
|
.child(
|
|
div()
|
|
.flex()
|
|
.items_center()
|
|
.justify_center()
|
|
.size_full()
|
|
.child("Custom Titlebar"),
|
|
),
|
|
)
|
|
})
|
|
.child(
|
|
div()
|
|
.p_8()
|
|
.flex()
|
|
.flex_col()
|
|
.gap_2()
|
|
.child("SubWindow")
|
|
.when(self.is_dialog, |div| {
|
|
div.child(button("Open Nested Dialog", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(window_bounds),
|
|
kind: WindowKind::Dialog,
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: true,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
})
|
|
.child(button("Close", |window, _| {
|
|
window.remove_window();
|
|
})),
|
|
)
|
|
}
|
|
}
|
|
|
|
struct WindowDemo {}
|
|
|
|
impl Render for WindowDemo {
|
|
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
let window_bounds =
|
|
WindowBounds::Windowed(Bounds::centered(None, size(px(300.0), px(300.0)), cx));
|
|
|
|
div()
|
|
.p_4()
|
|
.flex()
|
|
.flex_wrap()
|
|
.bg(rgb(0xffffff))
|
|
.size_full()
|
|
.justify_center()
|
|
.content_center()
|
|
.gap_2()
|
|
.child(button("Normal", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(window_bounds),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Popup", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(window_bounds),
|
|
kind: WindowKind::PopUp,
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Floating", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(window_bounds),
|
|
kind: WindowKind::Floating,
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Dialog", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(window_bounds),
|
|
kind: WindowKind::Dialog,
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: true,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Custom Titlebar", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
titlebar: None,
|
|
window_bounds: Some(window_bounds),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: true,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Invisible", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
show: false,
|
|
window_bounds: Some(window_bounds),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Unmovable", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
is_movable: false,
|
|
titlebar: None,
|
|
window_bounds: Some(window_bounds),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Unresizable", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
is_resizable: false,
|
|
window_bounds: Some(window_bounds),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Unminimizable", move |_, cx| {
|
|
cx.open_window(
|
|
WindowOptions {
|
|
is_minimizable: false,
|
|
window_bounds: Some(window_bounds),
|
|
..Default::default()
|
|
},
|
|
|_, cx| {
|
|
cx.new(|_| SubWindow {
|
|
custom_titlebar: false,
|
|
is_dialog: false,
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
}))
|
|
.child(button("Hide Application", |window, cx| {
|
|
cx.hide();
|
|
|
|
// Restore the application after 3 seconds
|
|
window
|
|
.spawn(cx, async move |cx| {
|
|
cx.background_executor()
|
|
.timer(std::time::Duration::from_secs(3))
|
|
.await;
|
|
cx.update(|_, cx| {
|
|
cx.activate(false);
|
|
})
|
|
})
|
|
.detach();
|
|
}))
|
|
.child(button("Resize", |window, _| {
|
|
let content_size = window.bounds().size;
|
|
window.resize(size(content_size.height, content_size.width));
|
|
}))
|
|
.child(button("Prompt", |window, cx| {
|
|
let answer = window.prompt(
|
|
PromptLevel::Info,
|
|
"Are you sure?",
|
|
None,
|
|
&["OK", "Cancel"],
|
|
cx,
|
|
);
|
|
|
|
cx.spawn(async move |_| {
|
|
if answer.await.unwrap() == 0 {
|
|
println!("You have clicked Ok");
|
|
} else {
|
|
println!("You have clicked Cancel");
|
|
}
|
|
})
|
|
.detach();
|
|
}))
|
|
.child(button("Prompt (non-English)", |window, cx| {
|
|
let answer = window.prompt(
|
|
PromptLevel::Info,
|
|
"Are you sure?",
|
|
None,
|
|
&[PromptButton::ok("确定"), PromptButton::cancel("取消")],
|
|
cx,
|
|
);
|
|
|
|
cx.spawn(async move |_| {
|
|
if answer.await.unwrap() == 0 {
|
|
println!("You have clicked Ok");
|
|
} else {
|
|
println!("You have clicked Cancel");
|
|
}
|
|
})
|
|
.detach();
|
|
}))
|
|
}
|
|
}
|
|
|
|
actions!(window, [Quit]);
|
|
|
|
fn run_example() {
|
|
application().run(|cx: &mut App| {
|
|
if !example_support::load_fonts(cx) {
|
|
return;
|
|
}
|
|
let bounds = Bounds::centered(None, size(px(800.0), px(600.0)), cx);
|
|
|
|
cx.open_window(
|
|
WindowOptions {
|
|
window_bounds: Some(WindowBounds::Windowed(bounds)),
|
|
..Default::default()
|
|
},
|
|
|window, cx| {
|
|
cx.new(|cx| {
|
|
cx.observe_window_bounds(window, move |_, window, _| {
|
|
println!("Window bounds changed: {:?}", window.bounds());
|
|
})
|
|
.detach();
|
|
|
|
WindowDemo {}
|
|
})
|
|
},
|
|
)
|
|
.unwrap();
|
|
|
|
cx.activate(true);
|
|
cx.on_action(|_: &Quit, cx| cx.quit());
|
|
cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
|
|
});
|
|
}
|
|
|
|
#[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();
|
|
}
|