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.

Sign up for GitHub

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

ui: show note previews when hovering reply descriptions #591

Merged
merged 2 commits into from
Dec 18, 2024
Merged

ui: show note previews when hovering reply descriptions #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4967f64
ui: show note previews when hovering reply descriptions
jb55 Dec 17, 2024
f748b8b
profile: fix avatar alignment in profile previews
jb55 Dec 17, 2024
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
94 changes: 74 additions & 20 deletions crates/notedeck_columns/src/ui/note/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,54 @@ fn reply_desc(
note_reply: &NoteReply,
ndb: &Ndb,
img_cache: &mut ImageCache,
) {
note_cache: &mut NoteCache,
) -> Option<NoteAction> {
#[cfg(feature = "profiling")]
puffin::profile_function!();

let mut note_action: Option<NoteAction> = None;
let size = 10.0;
let selectable = false;
let color = ui.style().visuals.noninteractive().fg_stroke.color;
let visuals = ui.visuals();
let color = visuals.noninteractive().fg_stroke.color;
let link_color = visuals.hyperlink_color;

// note link renderer helper
let note_link = |ui: &mut egui::Ui,
note_cache: &mut NoteCache,
img_cache: &mut ImageCache,
text: &str,
note: &Note<'_>| {
let r = ui.add(
Label::new(RichText::new(text).size(size).color(link_color))
.sense(Sense::click())
.selectable(selectable),
);

ui.add(Label::new(RichText::new("replying to").size(size).color(color)).selectable(selectable));
if r.clicked() {
// TODO: jump to note
}

let reply = if let Some(reply) = note_reply.reply() {
reply
} else {
return;
if r.hovered() {
r.on_hover_ui_at_pointer(|ui| {
ui.set_max_width(400.0);
ui::NoteView::new(ndb, note_cache, img_cache, note)
.actionbar(false)
.wide(true)
.show(ui);
});
}
};

ui.add(Label::new(RichText::new("replying to").size(size).color(color)).selectable(selectable));

let reply = note_reply.reply()?;

let reply_note = if let Ok(reply_note) = ndb.get_note_by_id(txn, reply.id) {
reply_note
} else {
ui.add(Label::new(RichText::new("a note").size(size).color(color)).selectable(selectable));
return;
return None;
};

if note_reply.is_reply_to_root() {
Expand All @@ -102,22 +129,29 @@ fn reply_desc(
.size(size)
.selectable(selectable),
);
ui.add(Label::new(RichText::new("'s note").size(size).color(color)).selectable(selectable));
ui.add(Label::new(RichText::new("'s").size(size).color(color)).selectable(selectable));
note_link(ui, note_cache, img_cache, "thread", &reply_note);
} else if let Some(root) = note_reply.root() {
// replying to another post in a thread, not the root

if let Ok(root_note) = ndb.get_note_by_id(txn, root.id) {
if root_note.pubkey() == reply_note.pubkey() {
// simply "replying to bob's note" when replying to bob in his thread
let action = ui::Mention::new(ndb, img_cache, txn, reply_note.pubkey())
.size(size)
.selectable(selectable)
.show(ui)
.inner;

if action.is_some() {
note_action = action;
}

ui.add(
ui::Mention::new(ndb, img_cache, txn, reply_note.pubkey())
.size(size)
.selectable(selectable),
);
ui.add(
Label::new(RichText::new("'s note").size(size).color(color))
.selectable(selectable),
Label::new(RichText::new("'s").size(size).color(color)).selectable(selectable),
);

note_link(ui, note_cache, img_cache, "note", &reply_note);
} else {
// replying to bob in alice's thread

Expand All @@ -126,6 +160,10 @@ fn reply_desc(
.size(size)
.selectable(selectable),
);
ui.add(
Label::new(RichText::new("'s").size(size).color(color)).selectable(selectable),
);
note_link(ui, note_cache, img_cache, "note", &reply_note);
ui.add(
Label::new(RichText::new("in").size(size).color(color)).selectable(selectable),
);
Expand All @@ -135,9 +173,9 @@ fn reply_desc(
.selectable(selectable),
);
ui.add(
Label::new(RichText::new("'s thread").size(size).color(color))
.selectable(selectable),
Label::new(RichText::new("'s").size(size).color(color)).selectable(selectable),
);
note_link(ui, note_cache, img_cache, "thread", &root_note);
}
} else {
ui.add(
Expand All @@ -151,6 +189,8 @@ fn reply_desc(
);
}
}

note_action
}

impl<'a> NoteView<'a> {
Expand Down Expand Up @@ -467,7 +507,14 @@ impl<'a> NoteView<'a> {

if note_reply.reply().is_some() {
ui.horizontal(|ui| {
reply_desc(ui, txn, &note_reply, self.ndb, self.img_cache);
reply_desc(
ui,
txn,
&note_reply,
self.ndb,
self.img_cache,
self.note_cache,
);
});
}
});
Expand Down Expand Up @@ -524,7 +571,14 @@ impl<'a> NoteView<'a> {
.borrow(self.note.tags());

if note_reply.reply().is_some() {
reply_desc(ui, txn, &note_reply, self.ndb, self.img_cache);
reply_desc(
ui,
txn,
&note_reply,
self.ndb,
self.img_cache,
self.note_cache,
);
}
});

Expand Down
14 changes: 12 additions & 2 deletions crates/notedeck_columns/src/ui/profile/preview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,18 @@ impl<'a, 'cache> ProfilePreview<'a, 'cache> {
}

fn body(self, ui: &mut egui::Ui) {
crate::ui::padding(12.0, ui, |ui| {
ui.add(ProfilePic::new(self.cache, get_profile_url(Some(self.profile))).size(80.0));
let padding = 12.0;
crate::ui::padding(padding, ui, |ui| {
let mut pfp_rect = ui.available_rect_before_wrap();
let size = 80.0;
pfp_rect.set_width(size);
pfp_rect.set_height(size);
let pfp_rect = pfp_rect.translate(egui::vec2(0.0, -(padding + 2.0 + (size / 2.0))));

ui.put(
pfp_rect,
ProfilePic::new(self.cache, get_profile_url(Some(self.profile))).size(size),
);
ui.add(display_name_widget(
get_display_name(Some(self.profile)),
false,
Expand Down
Loading