From ed0172be68370729625d7c920d61f5a67b3baef8 Mon Sep 17 00:00:00 2001 From: yggverse Date: Thu, 23 Jan 2025 10:21:30 +0200 Subject: [PATCH] enable identity selection for Titan protocol --- src/app/browser/window/tab/item.rs | 5 +++-- .../window/tab/item/page/navigation/request/widget.rs | 6 +----- .../tab/item/page/navigation/request/widget/primary_icon.rs | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/app/browser/window/tab/item.rs b/src/app/browser/window/tab/item.rs index b15d432f..ffd2d2d8 100644 --- a/src/app/browser/window/tab/item.rs +++ b/src/app/browser/window/tab/item.rs @@ -94,8 +94,9 @@ impl Item { move || { // Request should match valid URI for all drivers supported if let Some(uri) = page.navigation.request.uri() { - // Rout by scheme - if uri.scheme().to_lowercase() == "gemini" { + // Route by scheme + let scheme = uri.scheme(); + if scheme == "gemini" || scheme == "titan" { return identity::new_gemini( (&browser_action, &window_action), &profile, diff --git a/src/app/browser/window/tab/item/page/navigation/request/widget.rs b/src/app/browser/window/tab/item/page/navigation/request/widget.rs index f1e4e707..b5e05818 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/widget.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/widget.rs @@ -203,7 +203,7 @@ impl Widget { self.entry.set_primary_icon_name(Some(name)); self.entry.set_primary_icon_tooltip_text(Some(tooltip)); } - PrimaryIcon::Gemini { name, tooltip } => { + PrimaryIcon::Gemini { name, tooltip } | PrimaryIcon::Titan { name, tooltip } => { self.entry.set_primary_icon_activatable(true); self.entry.set_primary_icon_sensitive(true); self.entry.set_primary_icon_name(Some(name)); @@ -222,10 +222,6 @@ impl Widget { self.entry.set_primary_icon_name(Some(name)); self.entry.set_primary_icon_tooltip_text(Some(tooltip)); } - PrimaryIcon::Titan { name, tooltip } => { - self.entry.set_primary_icon_name(Some(name)); - self.entry.set_primary_icon_tooltip_text(Some(tooltip)); - } } // Update progress diff --git a/src/app/browser/window/tab/item/page/navigation/request/widget/primary_icon.rs b/src/app/browser/window/tab/item/page/navigation/request/widget/primary_icon.rs index 14754bcb..b5a67a1b 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/widget/primary_icon.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/widget/primary_icon.rs @@ -17,7 +17,7 @@ pub enum PrimaryIcon<'a> { }, Titan { name: &'a str, - tooltip: &'a str, + tooltip: (&'a str, &'a str), }, } @@ -46,7 +46,7 @@ pub fn from(request: &str) -> PrimaryIcon { if request.starts_with("titan:") { return PrimaryIcon::Titan { name: "document-send-symbolic", - tooltip: "Titan input", + tooltip: ("Guest titan input", "User titan input"), }; }