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

fix note response regression

Browse Source 
Fixes: 7d916805bc ("note: cleanup wide/standard implementation")
This commit is contained in:
William Casarin
2025-06-03 11:26:18 -07:00
parent 771537a4f6
commit f380c24649
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,15 +393,16 @@ impl<'a, 'd> NoteView<'a, 'd> {
txn: &Transaction, txn: &Transaction,
note_key: NoteKey, note_key: NoteKey,
profile: &Result<ProfileRecord, nostrdb::Error>, profile: &Result<ProfileRecord, nostrdb::Error>,
note_action: &mut Option<NoteAction>, ) -> egui::InnerResponse<Option<NoteAction>> {
) -> Response { let mut note_action: Option<NoteAction> = None;
ui.with_layout(egui::Layout::top_down(egui::Align::LEFT), |ui| { ui.with_layout(egui::Layout::top_down(egui::Align::LEFT), |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
let (pfp_resp, action) = self.pfp(note_key, profile, ui); let (pfp_resp, action) = self.pfp(note_key, profile, ui);
if pfp_resp.clicked() { if pfp_resp.clicked() {
*note_action = Some(NoteAction::Profile(Pubkey::new(*self.note.pubkey()))); note_action = Some(NoteAction::Profile(Pubkey::new(*self.note.pubkey())));
} else if let Some(action) = action { } else if let Some(action) = action {
*note_action = Some(NoteAction::Media(action)); note_action = Some(NoteAction::Media(action));
}; };
let size = ui.available_size(); let size = ui.available_size();
@@ -444,7 +445,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
.inner; .inner;
if action.is_some() { if action.is_some() {
*note_action = action; note_action = action;
} }
} }
}); });
@@ -462,7 +463,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
ui.add(&mut contents); ui.add(&mut contents);
if let Some(action) = contents.action { if let Some(action) = contents.action {
*note_action = Some(action); note_action = Some(action);
} }
if self.options().has_actionbar() { if self.options().has_actionbar() {
@@ -478,11 +479,12 @@ impl<'a, 'd> NoteView<'a, 'd> {
) )
.inner .inner
{ {
*note_action = Some(action); note_action = Some(action);
} }
} }
note_action
}) })
.response
} }
fn standard_ui( fn standard_ui(
@@ -491,15 +493,15 @@ impl<'a, 'd> NoteView<'a, 'd> {
txn: &Transaction, txn: &Transaction,
note_key: NoteKey, note_key: NoteKey,
profile: &Result<ProfileRecord, nostrdb::Error>, profile: &Result<ProfileRecord, nostrdb::Error>,
note_action: &mut Option<NoteAction>, ) -> egui::InnerResponse<Option<NoteAction>> {
) -> Response { let mut note_action: Option<NoteAction> = None;
// main design // main design
ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| { ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| {
let (pfp_resp, action) = self.pfp(note_key, profile, ui); let (pfp_resp, action) = self.pfp(note_key, profile, ui);
if pfp_resp.clicked() { if pfp_resp.clicked() {
*note_action = Some(NoteAction::Profile(Pubkey::new(*self.note.pubkey()))); note_action = Some(NoteAction::Profile(Pubkey::new(*self.note.pubkey())));
} else if let Some(action) = action { } else if let Some(action) = action {
*note_action = Some(NoteAction::Media(action)); note_action = Some(NoteAction::Media(action));
}; };
ui.with_layout(egui::Layout::top_down(egui::Align::LEFT), |ui| { ui.with_layout(egui::Layout::top_down(egui::Align::LEFT), |ui| {
@@ -526,7 +528,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
); );
if action.is_some() { if action.is_some() {
*note_action = action; note_action = action;
} }
} }
}); });
@@ -542,7 +544,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
ui.add(&mut contents); ui.add(&mut contents);
if let Some(action) = contents.action { if let Some(action) = contents.action {
*note_action = Some(action); note_action = Some(action);
} }
if self.options().has_actionbar() { if self.options().has_actionbar() {
@@ -558,12 +560,14 @@ impl<'a, 'd> NoteView<'a, 'd> {
) )
.inner .inner
{ {
*note_action = Some(action); note_action = Some(action);
} }
} }
});
note_action
})
.inner
}) })
.response
} }
#[profiling::function] #[profiling::function]
@@ -571,24 +575,27 @@ impl<'a, 'd> NoteView<'a, 'd> {
let note_key = self.note.key().expect("todo: support non-db notes"); let note_key = self.note.key().expect("todo: support non-db notes");
let txn = self.note.txn().expect("todo: support non-db notes"); let txn = self.note.txn().expect("todo: support non-db notes");
let mut note_action: Option<NoteAction> = None;
let profile = self let profile = self
.note_context .note_context
.ndb .ndb
.get_profile_by_pubkey(txn, self.note.pubkey()); .get_profile_by_pubkey(txn, self.note.pubkey());
let hitbox_id = note_hitbox_id(note_key, self.options(), self.parent);
let maybe_hitbox = maybe_note_hitbox(ui, hitbox_id);
// wide design // wide design
let response = if self.options().has_wide() { let response = if self.options().has_wide() {
self.wide_ui(ui, txn, note_key, &profile, &mut note_action) self.wide_ui(ui, txn, note_key, &profile)
} else { } else {
self.standard_ui(ui, txn, note_key, &profile, &mut note_action) self.standard_ui(ui, txn, note_key, &profile)
}; };
let mut note_action = response.inner;
if self.options().has_options_button() { if self.options().has_options_button() {
let context_pos = { let context_pos = {
let size = NoteContextButton::max_width(); let size = NoteContextButton::max_width();
let top_right = response.rect.right_top(); let top_right = response.response.rect.right_top();
let min = Pos2::new(top_right.x - size, top_right.y); let min = Pos2::new(top_right.x - size, top_right.y);
Rect::from_min_size(min, egui::vec2(size, size)) Rect::from_min_size(min, egui::vec2(size, size))
}; };
@@ -599,15 +606,14 @@ impl<'a, 'd> NoteView<'a, 'd> {
} }
} }
let hitbox_id = note_hitbox_id(note_key, self.options(), self.parent); let note_action =
let maybe_hitbox = maybe_note_hitbox(ui, hitbox_id); if note_hitbox_clicked(ui, hitbox_id, &response.response.rect, maybe_hitbox) {
let note_action = if note_hitbox_clicked(ui, hitbox_id, &response.rect, maybe_hitbox) { Some(NoteAction::Note(NoteId::new(*self.note.id())))
Some(NoteAction::Note(NoteId::new(*self.note.id()))) } else {
} else { note_action
note_action };
};
NoteResponse::new(response).with_action(note_action) NoteResponse::new(response.response).with_action(note_action)
} }
} }