@@ -1,6 +1,7 @@
|
||||
use crate::{
|
||||
gif::{handle_repaint, retrieve_latest_texture},
|
||||
images::{render_images, ImageType},
|
||||
jobs::JobsCache,
|
||||
note::{NoteAction, NoteOptions, NoteResponse, NoteView},
|
||||
};
|
||||
|
||||
@@ -18,6 +19,7 @@ pub struct NoteContents<'a, 'd> {
|
||||
note: &'a Note<'a>,
|
||||
options: NoteOptions,
|
||||
pub action: Option<NoteAction>,
|
||||
jobs: &'a mut JobsCache,
|
||||
}
|
||||
|
||||
impl<'a, 'd> NoteContents<'a, 'd> {
|
||||
@@ -28,6 +30,7 @@ impl<'a, 'd> NoteContents<'a, 'd> {
|
||||
txn: &'a Transaction,
|
||||
note: &'a Note,
|
||||
options: NoteOptions,
|
||||
jobs: &'a mut JobsCache,
|
||||
) -> Self {
|
||||
NoteContents {
|
||||
note_context,
|
||||
@@ -36,6 +39,7 @@ impl<'a, 'd> NoteContents<'a, 'd> {
|
||||
note,
|
||||
options,
|
||||
action: None,
|
||||
jobs,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -49,6 +53,7 @@ impl egui::Widget for &mut NoteContents<'_, '_> {
|
||||
self.txn,
|
||||
self.note,
|
||||
self.options,
|
||||
self.jobs,
|
||||
);
|
||||
self.action = result.action;
|
||||
result.response
|
||||
@@ -67,6 +72,7 @@ pub fn render_note_preview(
|
||||
id: &[u8; 32],
|
||||
parent: NoteKey,
|
||||
note_options: NoteOptions,
|
||||
jobs: &mut JobsCache,
|
||||
) -> NoteResponse {
|
||||
let note = if let Ok(note) = note_context.ndb.get_note_by_id(txn, id) {
|
||||
// TODO: support other preview kinds
|
||||
@@ -91,7 +97,7 @@ pub fn render_note_preview(
|
||||
*/
|
||||
};
|
||||
|
||||
NoteView::new(note_context, cur_acc, ¬e, note_options)
|
||||
NoteView::new(note_context, cur_acc, ¬e, note_options, jobs)
|
||||
.preview_style()
|
||||
.parent(parent)
|
||||
.show(ui)
|
||||
@@ -106,6 +112,7 @@ pub fn render_note_contents(
|
||||
txn: &Transaction,
|
||||
note: &Note,
|
||||
options: NoteOptions,
|
||||
jobs: &mut JobsCache,
|
||||
) -> NoteResponse {
|
||||
let note_key = note.key().expect("todo: implement non-db notes");
|
||||
let selectable = options.has_selectable_text();
|
||||
@@ -254,7 +261,7 @@ pub fn render_note_contents(
|
||||
});
|
||||
|
||||
let preview_note_action = if let Some((id, _block_str)) = inline_note {
|
||||
render_note_preview(ui, note_context, cur_acc, txn, id, note_key, options).action
|
||||
render_note_preview(ui, note_context, cur_acc, txn, id, note_key, options, jobs).action
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user