Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge example page into welcome screen #5329

Merged
merged 15 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added crates/re_ui/data/icons/arrow_down.png
jprochazk marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions crates/re_ui/src/design_tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ fn apply_design_tokens(ctx: &egui::Context) -> DesignTokens {
egui_style
.text_styles
.insert(ReUi::welcome_screen_h3(), egui::FontId::proportional(15.0));
egui_style.text_styles.insert(
ReUi::welcome_screen_example_title(),
egui::FontId::proportional(16.0),
);
egui_style.text_styles.insert(
ReUi::welcome_screen_body(),
egui::FontId::proportional(13.0),
Expand Down
2 changes: 2 additions & 0 deletions crates/re_ui/src/icons.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ pub const ARROW_RIGHT: Icon = Icon::new(
"arrow_right",
include_bytes!("../data/icons/arrow_right.png"),
);
pub const ARROW_DOWN: Icon =
Icon::new("arrow_down", include_bytes!("../data/icons/arrow_down.png"));
pub const LOOP: Icon = Icon::new("loop", include_bytes!("../data/icons/loop.png"));

pub const RIGHT_PANEL_TOGGLE: Icon = Icon::new(
Expand Down
5 changes: 5 additions & 0 deletions crates/re_ui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ impl ReUi {
egui::TextStyle::Name("welcome-screen-h3".into())
}

#[inline]
pub fn welcome_screen_example_title() -> egui::TextStyle {
egui::TextStyle::Name("welcome-screen-example-title".into())
}

#[inline]
pub fn welcome_screen_body() -> egui::TextStyle {
egui::TextStyle::Name("welcome-screen-body".into())
Expand Down
Loading
Loading