Post mentions

Cargo.toml

@@ -57,6 +57,10 @@ uuid = { version = "1.10.0", features = ["v4"] }
 security-framework = "2.11.0"
 sha2 = "0.10.8"
 
+[patch.crates-io]
+egui = { git = "https://github.com/kernelkind/egui", branch = "update_layouter_0.29.1" }
+epaint = { git = "https://github.com/kernelkind/egui", branch = "update_layouter_0.29.1" }
+
 [profile.small]
 inherits = 'release'
 opt-level = 'z'     # Optimize for size

crates/notedeck_columns/Cargo.toml

@@ -52,6 +52,7 @@ rfd = "0.15"
 
 [dev-dependencies]
 tempfile = { workspace = true }
+pretty_assertions = "1.4.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 security-framework = "2.11.0"

crates/notedeck_columns/src/app.rs

@@ -500,7 +500,8 @@ fn render_damus_mobile(app: &mut Damus, app_ctx: &mut AppContext<'_>, ui: &mut e
     //let routes = app.timelines[0].routes.clone();
 
     if !app.columns(app_ctx.accounts).columns().is_empty()
-        && nav::render_nav(0, app, app_ctx, ui).process_render_nav_response(app, app_ctx)
+        && nav::render_nav(0, ui.available_rect_before_wrap(), app, app_ctx, ui)
+            .process_render_nav_response(app, app_ctx)
         && !app.tmp_columns
     {
         storage::save_decks_cache(app_ctx.path, &app.decks_cache);
@@ -584,14 +585,17 @@ fn timelines_view(ui: &mut egui::Ui, sizes: Size, app: &mut Damus, ctx: &mut App
             for col_index in 0..num_cols {
                 strip.cell(|ui| {
                     let rect = ui.available_rect_before_wrap();
-                    responses.push(nav::render_nav(col_index, app, ctx, ui));
+                    let v_line_stroke = ui.visuals().widgets.noninteractive.bg_stroke;
+                    let inner_rect = {
+                        let mut inner = rect;
+                        inner.set_right(rect.right() - v_line_stroke.width);
+                        inner
+                    };
+                    responses.push(nav::render_nav(col_index, inner_rect, app, ctx, ui));
 
                     // vertical line
-                    ui.painter().vline(
-                        rect.right(),
-                        rect.y_range(),
-                        ui.visuals().widgets.noninteractive.bg_stroke,
-                    );
+                    ui.painter()
+                        .vline(rect.right(), rect.y_range(), v_line_stroke);
                 });
 
                 //strip.cell(|ui| timeline::timeline_view(ui, app, timeline_ind));

crates/notedeck_columns/src/draft.rs

@@ -1,16 +1,25 @@
+use egui::text::LayoutJob;
 use poll_promise::Promise;
 
-use crate::{media_upload::Nip94Event, ui::note::PostType, Error};
+use crate::{media_upload::Nip94Event, post::PostBuffer, ui::note::PostType, Error};
 use std::collections::HashMap;
 
 #[derive(Default)]
 pub struct Draft {
-    pub buffer: String,
+    pub buffer: PostBuffer,
+    pub cur_layout: Option<(String, LayoutJob)>, // `PostBuffer::text_buffer` to current `LayoutJob`
+    pub cur_mention_hint: Option<MentionHint>,
     pub uploaded_media: Vec<Nip94Event>, // media uploads to include
     pub uploading_media: Vec<Promise<Result<Nip94Event, Error>>>, // promises that aren't ready yet
     pub upload_errors: Vec<String>,      // media upload errors to show the user
 }
 
+pub struct MentionHint {
+    pub index: usize,
+    pub pos: egui::Pos2,
+    pub text: String,
+}
+
 #[derive(Default)]
 pub struct Drafts {
     replies: HashMap<[u8; 32], Draft>,
@@ -46,7 +55,7 @@ impl Draft {
     }
 
     pub fn clear(&mut self) {
-        self.buffer = "".to_string();
+        self.buffer = PostBuffer::default();
         self.upload_errors = Vec::new();
         self.uploaded_media = Vec::new();
         self.uploading_media = Vec::new();

crates/notedeck_columns/src/nav.rs

@@ -241,6 +241,7 @@ fn render_nav_body(
     top: &Route,
     depth: usize,
     col: usize,
+    inner_rect: egui::Rect,
 ) -> Option<RenderNavAction> {
     match top {
         Route::Timeline(kind) => render_timeline_route(
@@ -308,6 +309,7 @@ fn render_nav_body(
                         ctx.note_cache,
                         ctx.img_cache,
                         &note,
+                        inner_rect,
                     )
                     .id_source(id)
                     .show(ui)
@@ -342,6 +344,7 @@ fn render_nav_body(
                     ctx.img_cache,
                     draft,
                     &note,
+                    inner_rect,
                 )
                 .id_source(id)
                 .show(ui)
@@ -362,6 +365,7 @@ fn render_nav_body(
                 ctx.img_cache,
                 ctx.note_cache,
                 kp,
+                inner_rect,
             )
             .ui(&txn, ui);
 
@@ -473,6 +477,7 @@ fn render_nav_body(
 #[must_use = "RenderNavResponse must be handled by calling .process_render_nav_response(..)"]
 pub fn render_nav(
     col: usize,
+    inner_rect: egui::Rect,
     app: &mut Damus,
     ctx: &mut AppContext<'_>,
     ui: &mut egui::Ui,
@@ -508,7 +513,7 @@ pub fn render_nav(
         .show(ui),
         NavUiType::Body => {
             if let Some(top) = nav.routes().last() {
-                render_nav_body(ui, app, ctx, top, nav.routes().len(), col)
+                render_nav_body(ui, app, ctx, top, nav.routes().len(), col, inner_rect)
             } else {
                 None
             }