diff --git a/crates/re_ui/src/design_tokens.rs b/crates/re_ui/src/design_tokens.rs index 07969e8327ae..a595575b8b90 100644 --- a/crates/re_ui/src/design_tokens.rs +++ b/crates/re_ui/src/design_tokens.rs @@ -126,11 +126,11 @@ fn apply_design_tokens(ctx: &egui::Context) -> DesignTokens { egui_style.visuals.widgets.noninteractive.bg_stroke.color = Color32::from_gray(30); // from figma. separator lines, panel lines, etc - let subudued = get_aliased_color(&json, "{Alias.Color.Text.Subdued.value}"); + let subdued = get_aliased_color(&json, "{Alias.Color.Text.Subdued.value}"); let default = get_aliased_color(&json, "{Alias.Color.Text.Default.value}"); let strong = get_aliased_color(&json, "{Alias.Color.Text.Strong.value}"); - egui_style.visuals.widgets.noninteractive.fg_stroke.color = subudued; // non-interactive text + egui_style.visuals.widgets.noninteractive.fg_stroke.color = subdued; // non-interactive text egui_style.visuals.widgets.inactive.fg_stroke.color = default; // button text egui_style.visuals.widgets.active.fg_stroke.color = strong; // strong text and active button text @@ -167,6 +167,9 @@ fn apply_design_tokens(ctx: &egui::Context) -> DesignTokens { egui_style.spacing.scroll_bar_width = 6.0; egui_style.spacing.scroll_bar_outer_margin = 2.0; + // don't color hyperlinks #2733 + egui_style.visuals.hyperlink_color = default; + ctx.set_style(egui_style); DesignTokens { diff --git a/crates/re_viewer/src/ui/rerun_menu.rs b/crates/re_viewer/src/ui/rerun_menu.rs index 99634765602a..f725284c7483 100644 --- a/crates/re_viewer/src/ui/rerun_menu.rs +++ b/crates/re_viewer/src/ui/rerun_menu.rs @@ -79,10 +79,17 @@ impl App { }); ui.add_space(spacing); - ui.hyperlink_to( - "Help", - "https://www.rerun.io/docs/getting-started/viewer-walkthrough", - ); + + // dont use `hyperlink_to` for styling reasons + if ui.button("Help").clicked() { + ui.ctx().output_mut(|o| { + o.open_url = Some(egui::output::OpenUrl { + url: "https://www.rerun.io/docs/getting-started/viewer-walkthrough" + .to_owned(), + new_tab: true, + }); + }); + } #[cfg(not(target_arch = "wasm32"))] { @@ -128,9 +135,6 @@ impl App { LLVM {llvm_version}\n\ Built {datetime}", )); - - ui.add_space(12.0); - ui.hyperlink_to("www.rerun.io", "https://www.rerun.io/"); } fn recordings_menu(&self, ui: &mut egui::Ui, store_context: Option<&StoreContext<'_>>) { diff --git a/crates/re_viewer/src/ui/top_panel.rs b/crates/re_viewer/src/ui/top_panel.rs index 3ca2ee73242d..ab026ba084fe 100644 --- a/crates/re_viewer/src/ui/top_panel.rs +++ b/crates/re_viewer/src/ui/top_panel.rs @@ -171,14 +171,6 @@ fn website_link_ui(ui: &mut egui::Ui, app: &mut App) { .on_hover_cursor(egui::CursorIcon::PointingHand); let url = "https://rerun.io/"; if response.clicked() { - let modifiers = ui.ctx().input(|i| i.modifiers); - ui.ctx().output_mut(|o| { - o.open_url = Some(egui::output::OpenUrl { - url: url.to_owned(), - new_tab: modifiers.any(), - }); - }); - } else if response.middle_clicked() { ui.ctx().output_mut(|o| { o.open_url = Some(egui::output::OpenUrl { url: url.to_owned(),