tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui: remove show_pointer

Browse Source 
This can just be achieved by on_hover_cursor

Didn't realize this.

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2025-07-16 09:17:27 -07:00
parent f27b1fe957
commit 461665f599
10 changed files with 58 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/notedeck_ui/src/lib.rs
View File

@@ -58,7 +58,3 @@ pub fn hline_with_width(ui: &egui::Ui, range: egui::Rangef) {
let stroke = ui.style().visuals.widgets.noninteractive.bg_stroke;
ui.painter().hline(range, resize_y, stroke);
}
pub fn show_pointer(ui: &egui::Ui) {
ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand);
}

18
crates/notedeck_ui/src/mention.rs
View File

@@ -1,4 +1,4 @@
use crate::{show_pointer, ProfilePreview};
use crate::ProfilePreview;
use egui::Sense;
use enostr::Pubkey;
use nostrdb::{Ndb, Transaction};
@@ -75,18 +75,16 @@ fn mention_ui(
get_display_name(profile.as_ref()).username_or_displayname()
);
let resp = ui.add(
egui::Label::new(egui::RichText::new(name).color(link_color).size(size))
.sense(Sense::click())
.selectable(selectable),
);
let resp = ui
.add(
egui::Label::new(egui::RichText::new(name).color(link_color).size(size))
.sense(Sense::click())
.selectable(selectable),
)
.on_hover_cursor(egui::CursorIcon::PointingHand);
let note_action = if resp.clicked() {
show_pointer(ui);
Some(NoteAction::Profile(Pubkey::new(*pk)))
} else if resp.hovered() {
show_pointer(ui);
None
} else {
None
};

6
crates/notedeck_ui/src/note/contents.rs
View File

@@ -189,12 +189,12 @@ pub fn render_note_contents(
},
BlockType::Hashtag => {
let resp = ui.colored_label(link_color, format!("#{}", block.as_str()));
let resp = ui
.colored_label(link_color, format!("#{}", block.as_str()))
.on_hover_cursor(egui::CursorIcon::PointingHand);
if resp.clicked() {
note_action = Some(NoteAction::Hashtag(block.as_str().to_string()));
} else if resp.hovered() {
crate::show_pointer(ui);
}
}

20
crates/notedeck_ui/src/note/mod.rs
View File

@@ -669,14 +669,12 @@ fn show_actual_pfp(
anim_speed,
);
let resp = resp.on_hover_cursor(egui::CursorIcon::PointingHand);
let mut pfp = ProfilePic::new(images, pic).size(size);
let pfp_resp = ui.put(rect, &mut pfp);
let action = pfp.action;
if resp.hovered() || resp.clicked() {
crate::show_pointer(ui);
}
pfp_resp.on_hover_ui_at_pointer(|ui| {
ui.set_max_width(300.0);
ui.add(ProfilePreview::new(profile.as_ref().unwrap(), images));
@@ -768,20 +766,17 @@ fn render_note_actionbar(
note_key: NoteKey,
) -> egui::InnerResponse<Option<NoteAction>> {
ui.horizontal(|ui| 's: {
let reply_resp = reply_button(ui, note_key);
let quote_resp = quote_repost_button(ui, note_key);
let reply_resp = reply_button(ui, note_key).on_hover_cursor(egui::CursorIcon::PointingHand);
let quote_resp =
quote_repost_button(ui, note_key).on_hover_cursor(egui::CursorIcon::PointingHand);
let to_noteid = |id: &[u8; 32]| NoteId::new(*id);
if reply_resp.clicked() {
break 's Some(NoteAction::Reply(to_noteid(note_id)));
} else if reply_resp.hovered() {
crate::show_pointer(ui);
}
if quote_resp.clicked() {
break 's Some(NoteAction::Quote(to_noteid(note_id)));
} else if quote_resp.hovered() {
crate::show_pointer(ui);
}
let Some(Zapper { zaps, cur_acc }) = zapper else {
@@ -815,11 +810,8 @@ fn render_note_actionbar(
ui.add(x_button(rect)).on_hover_text(err.to_string())
}
}
};
if zap_resp.hovered() {
crate::show_pointer(ui);
}
.on_hover_cursor(egui::CursorIcon::PointingHand);
if zap_resp.secondary_clicked() {
break 's Some(NoteAction::Zap(ZapAction::CustomizeAmount(target)));