diff --git a/crates/notedeck_columns/src/ui/profile/mod.rs b/crates/notedeck_columns/src/ui/profile/mod.rs index 50425807..a2b8cbb0 100644 --- a/crates/notedeck_columns/src/ui/profile/mod.rs +++ b/crates/notedeck_columns/src/ui/profile/mod.rs @@ -12,8 +12,8 @@ use crate::{ ui::timeline::{tabs_ui, TimelineTabView}, }; use notedeck::{ - name::get_display_name, profile::get_profile_url, ui::is_narrow, Accounts, IsFollowing, - MuteFun, NoteAction, NoteContext, NotedeckTextStyle, + name::get_display_name, profile::get_profile_url, Accounts, IsFollowing, MuteFun, NoteAction, + NoteContext, NotedeckTextStyle, }; use notedeck_ui::{ app_images, @@ -246,7 +246,7 @@ impl<'a, 'd> ProfileView<'a, 'd> { } if let Some(lud16) = lud16 { - if is_narrow(ui.ctx()) && website_url.is_some() { + if website_url.is_some() { ui.end_row(); } ui.horizontal(|ui| { diff --git a/crates/notedeck_ui/src/profile/mod.rs b/crates/notedeck_ui/src/profile/mod.rs index 40048833..bb9c4ad1 100644 --- a/crates/notedeck_ui/src/profile/mod.rs +++ b/crates/notedeck_ui/src/profile/mod.rs @@ -8,7 +8,7 @@ pub use picture::ProfilePic; pub use preview::ProfilePreview; use egui::{load::TexturePoll, Label, RichText}; -use notedeck::{ui::is_narrow, IsFollowing, NostrName, NotedeckTextStyle}; +use notedeck::{IsFollowing, NostrName, NotedeckTextStyle}; use crate::{app_images, colors, widgets::styled_button_toggleable}; @@ -39,7 +39,7 @@ pub fn display_name_widget<'a>( ) }); - if is_narrow(ui.ctx()) { + if name.username.is_some() && name.nip05.is_some() { ui.end_row(); } @@ -74,12 +74,7 @@ pub fn display_name_widget<'a>( } } -pub fn about_section_widget<'a, 'b>( - profile: Option<&'b ProfileRecord<'a>>, -) -> impl egui::Widget + 'b -where - 'b: 'a, -{ +pub fn about_section_widget<'a>(profile: Option<&'a ProfileRecord<'a>>) -> impl egui::Widget + 'a { move |ui: &mut egui::Ui| { if let Some(about) = profile .map(|p| p.record().profile())