notedeck

commit 8e0e42a1f343f1c3cf87292e6d5d18bd3eea7dda
parent e7113b17a81319c0743e5db4a523f98dadb9f220
Author: kernelkind <kernelkind@gmail.com>
Date:   Fri,  7 Mar 2025 18:03:34 -0500

fix note content rects

Signed-off-by: kernelkind <kernelkind@gmail.com>

Diffstat:
M
crates/notedeck_columns/src/ui/note/contents.rs
 | 
6
++++++
M
crates/notedeck_columns/src/ui/note/mod.rs
 | 
5
+++++
M
crates/notedeck_columns/src/ui/note/options.rs
 | 
4
++++
M
crates/notedeck_columns/src/ui/note/reply_description.rs
 | 
1
+

4 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/crates/notedeck_columns/src/ui/note/contents.rs b/crates/notedeck_columns/src/ui/note/contents.rs
@@ -119,6 +119,7 @@ pub fn render_note_preview(
                 .note_previews(false)
                 .options_button(true)
                 .parent(parent)
+                .is_preview(true)
                 .show(ui)
         })
         .inner
@@ -145,6 +146,11 @@ fn render_note_contents(
     let hide_media = options.has_hide_media();
     let link_color = ui.visuals().hyperlink_color;
 
+    if !options.has_is_preview() {
+        // need this for the rect to take the full width of the column
+        let _ = ui.allocate_at_least(egui::vec2(ui.available_width(), 0.0), egui::Sense::click());
+    }
+
     let response = ui.horizontal_wrapped(|ui| {
         let blocks = if let Ok(blocks) = ndb.get_blocks_by_key(txn, note_key) {
             blocks
diff --git a/crates/notedeck_columns/src/ui/note/mod.rs b/crates/notedeck_columns/src/ui/note/mod.rs
@@ -145,6 +145,11 @@ impl<'a> NoteView<'a> {
         self
     }
 
+    pub fn is_preview(mut self, is_preview: bool) -> Self {
+        self.options_mut().set_is_preview(is_preview);
+        self
+    }
+
     fn textmode_ui(&mut self, ui: &mut egui::Ui) -> egui::Response {
         let note_key = self.note.key().expect("todo: implement non-db notes");
         let txn = self.note.txn().expect("todo: implement non-db notes");
diff --git a/crates/notedeck_columns/src/ui/note/options.rs b/crates/notedeck_columns/src/ui/note/options.rs
@@ -18,6 +18,9 @@ bitflags! {
 
         /// Scramble text so that its not distracting during development
         const scramble_text   = 0b0000001000000000;
+
+        /// Whether the current note is a preview
+        const is_preview      = 0b0000010000000000;
     }
 }
 
@@ -56,6 +59,7 @@ impl NoteOptions {
     create_bit_methods!(set_options_button, has_options_button, options_button);
     create_bit_methods!(set_hide_media, has_hide_media, hide_media);
     create_bit_methods!(set_scramble_text, has_scramble_text, scramble_text);
+    create_bit_methods!(set_is_preview, has_is_preview, is_preview);
 
     pub fn new(is_universe_timeline: bool) -> Self {
         let mut options = NoteOptions::default();
diff --git a/crates/notedeck_columns/src/ui/note/reply_description.rs b/crates/notedeck_columns/src/ui/note/reply_description.rs
@@ -48,6 +48,7 @@ pub fn reply_desc(
                 ui::NoteView::new(ndb, note_cache, img_cache, note, note_options)
                     .actionbar(false)
                     .wide(true)
+                    .is_preview(true)
                     .show(ui);
             });
         }