wallet/chatedit: clean up debug output, and add more rule checking for actions.

bin/darkwallet/src/app/schema.rs

@@ -98,6 +98,7 @@ mod ui_consts {
     pub const EDITCHAT_SELECT_ASCENT: f32 = 30.;
     pub const EDITCHAT_SELECT_DESCENT: f32 = 10.;
     pub const EDITCHAT_HANDLE_DESCENT: f32 = 35.;
+    pub const EDITCHAT_LINESPACING: f32 = 35.;
     pub const TEXTBAR_BASELINE: f32 = 34.;
     pub const TEXT_DESCENT: f32 = 10.;
     pub const EDITCHAT_LHS_PAD: f32 = 20.;

bin/darkwallet/src/ui/chatedit.rs

@@ -60,6 +60,10 @@ use super::{
     DrawUpdate, OnModify, UIObject,
 };
 
+// Minimum dist to update scroll when finger scrolling.
+// Avoid updating too much makes scrolling smoother.
+const VERT_SCROLL_UPDATE_INC: f32 = 1.;
+
 fn is_all_whitespace(glyphs: &[Glyph]) -> bool {
     for glyph in glyphs {
         if !is_whitespace(&glyph.substr) {
@@ -260,7 +264,7 @@ impl WrappedLines {
         for (line_idx, wrap_line) in self.lines.iter().enumerate() {
             // Is it within this line?
             if point.y < self.linespacing {
-                debug!(target: "ui::editbox::wrapped_lines", "point to pos found line: {line_idx}");
+                //debug!(target: "ui::editbox::wrapped_lines", "point to pos found line: {line_idx}");
                 pos += wrap_line.find_closest(point.x);
                 return pos
             }
@@ -269,7 +273,7 @@ impl WrappedLines {
             point.y -= self.linespacing;
             pos += wrap_line.len();
         }
-        debug!(target: "ui::editbox::wrapped_lines", "point to pos using last line");
+        //debug!(target: "ui::editbox::wrapped_lines", "point to pos using last line");
         pos
     }
 
@@ -340,7 +344,7 @@ enum TouchStateAction {
     Select,
     DragSelectHandle { side: isize },
     ScrollVert { start_pos: Point, scroll_start: f32 },
-    SetCursorPos { start_pos: Point },
+    SetCursorPos,
 }
 
 struct TouchInfo {
@@ -371,7 +375,7 @@ impl TouchInfo {
                 let travel_dist = pos.dist_sq(&start_pos);
                 let grad = (pos.y - start_pos.y) / (pos.x - start_pos.x);
                 let elapsed = instant.elapsed().as_millis();
-                debug!(target: "ui::chatedit::touch", "TouchInfo::update() [travel_dist={travel_dist}, grad={grad}]");
+                //debug!(target: "ui::chatedit::touch", "TouchInfo::update() [travel_dist={travel_dist}, grad={grad}]");
 
                 if travel_dist < 5. {
                     if elapsed > 1000 {
@@ -387,7 +391,7 @@ impl TouchInfo {
                 } else {
                     // Horizontal movement
                     debug!(target: "ui::chatedit::touch", "update touch state: Started -> SetCursorPos");
-                    self.state = TouchStateAction::SetCursorPos { start_pos: *start_pos };
+                    self.state = TouchStateAction::SetCursorPos;
                 }
             }
             _ => {}
@@ -646,7 +650,7 @@ impl ChatEdit {
         );
 
         let mut clip = self.rect.get();
-        debug!(target: "ui::chatedit", "Rendering text '{text}' rect={clip:?} width={width}");
+        //debug!(target: "ui::chatedit", "Rendering text '{text}' rect={clip:?} width={width}");
         clip.x = 0.;
         clip.y = 0.;
 
@@ -848,6 +852,7 @@ impl ChatEdit {
         let handle_descent = self.handle_descent.get();
         let color = self.text_hi_color.get();
         let linespacing = self.linespacing.get();
+        let scroll = self.scroll.get();
         // Transparent for fade
         let mut color_trans = color.clone();
         color_trans[3] = 0.;
@@ -855,7 +860,12 @@ impl ChatEdit {
         // find start_x
         let (glyph_rect, line_idx) = wrapped_lines.get_glyph_info(gpos);
         let x = glyph_rect.x;
-        let y_off = line_idx as f32 * linespacing;
+        let y_off = line_idx as f32 * linespacing - scroll;
+
+        let y = y_off + baseline + handle_descent;
+        if y < 0. {
+            return
+        }
 
         // Vertical line downwards. We use this instead of draw_box() so we have a fade.
         let verts = vec![
@@ -883,8 +893,6 @@ impl ChatEdit {
         let indices = vec![0, 2, 1, 1, 2, 3];
         mesh.append(verts, indices);
 
-        let y = y_off + baseline + handle_descent;
-
         // The arrow itself.
         // Go anti-clockwise
         let verts = vec![
@@ -1226,18 +1234,22 @@ impl ChatEdit {
             return false
         }
 
-        self.abs_to_local(&mut touch_pos);
-
         touch_info.start(touch_pos);
         true
     }
     fn try_handle_drag(&self, touch_info: &mut TouchInfo, mut touch_pos: Point) -> bool {
+        // Is the handle visible? Use y within rect before adding the scroll.
+        let relative_y = touch_pos.y - self.rect.get().y;
+        if relative_y < 0. {
+            return false
+        }
+
         self.abs_to_local(&mut touch_pos);
 
         let linespacing = self.linespacing.get();
         let baseline = self.baseline.get();
         let select_descent = self.select_descent.get();
-        //let scroll = self.scroll.get();
+        let scroll = self.scroll.get();
 
         let mut text_wrap = self.text_wrap.lock();
         let width = self.wrap_width();
@@ -1283,8 +1295,11 @@ impl ChatEdit {
     }
 
     async fn handle_touch_move(&self, mut touch_pos: Point) -> bool {
-        debug!(target: "ui::chatedit", "handle_touch_move({touch_pos:?})");
-        self.abs_to_local(&mut touch_pos);
+        //debug!(target: "ui::chatedit", "handle_touch_move({touch_pos:?})");
+        // We must update with non relative touch_pos bcos when doing vertical scrolling
+        // we will modify the scroll, which is used by abs_to_local(), which is used
+        // to then calculate the max scroll. So it ends up jumping around.
+        // We use the abs touch_pos without scroll adjust applied for vert scrolling.
         let touch_state = {
             let mut touch_info = self.touch_info.lock();
             touch_info.update(&touch_pos);
@@ -1293,12 +1308,14 @@ impl ChatEdit {
         match &touch_state {
             TouchStateAction::Inactive => return false,
             TouchStateAction::StartSelect => {
+                self.abs_to_local(&mut touch_pos);
                 self.start_touch_select(touch_pos);
                 self.redraw().await;
                 debug!(target: "ui::chatedit::touch", "touch state: StartSelect -> Select");
                 self.touch_info.lock().state = TouchStateAction::Select;
             }
             TouchStateAction::DragSelectHandle { side } => {
+                self.abs_to_local(&mut touch_pos);
                 {
                     let linespacing = self.linespacing.get();
                     let baseline = self.baseline.get();
@@ -1319,14 +1336,11 @@ impl ChatEdit {
 
                     // Only allow selecting text that is visible in the box
                     // We do our calcs relative to (0, 0) so bhs = rect_h
-                    let rect_bhs = self.rect.get().h;
-                    debug!(target: "ui::chatedit", "min({}, {rect_bhs})", point.y);
-                    point.y = min_f32(point.y, rect_bhs);
-
-                    point.y -= linespacing + handle_descent;
+                    point.y -= handle_descent + 25.;
+                    let bhs = wrapped_lines.height();
+                    point.y = min_f32(point.y, bhs);
 
                     let mut pos = wrapped_lines.point_to_pos(point);
-                    debug!(target: "ui::chatedit", "desired pos = {point:?} [touch_pos={touch_pos:?}");
 
                     if *side == -1 {
                         let select_other_pos = &mut select.end;
@@ -1353,9 +1367,18 @@ impl ChatEdit {
                 let y_dist = start_pos.y - touch_pos.y;
                 let mut scroll = scroll_start + y_dist;
                 scroll = scroll.clamp(0., max_scroll);
+                if (self.scroll.get() - scroll).abs() < VERT_SCROLL_UPDATE_INC {
+                    return true
+                }
                 self.scroll.set(scroll);
                 self.redraw().await;
             }
+            TouchStateAction::SetCursorPos => {
+                // TBH I can't even see the cursor under my thumb so I'll just
+                // comment this for now.
+                //self.abs_to_local(&mut touch_pos);
+                //self.touch_set_cursor_pos(touch_pos).await
+            }
             _ => {}
         }
         true
@@ -1367,22 +1390,8 @@ impl ChatEdit {
         let state = self.touch_info.lock().stop();
         match state {
             TouchStateAction::Inactive => return false,
-            TouchStateAction::Started { pos: _, instant: _ } |
-            TouchStateAction::SetCursorPos { start_pos: _ } => {
-                let width = self.wrap_width();
-                {
-                    let mut text_wrap = self.text_wrap.lock();
-                    let cursor_pos = text_wrap.set_cursor_with_point(touch_pos, width);
-
-                    let select = &mut text_wrap.select;
-                    select.clear();
-                }
-
-                self.is_phone_select.store(false, Ordering::Relaxed);
-                // Reshow cursor (if hidden)
-                self.hide_cursor.store(false, Ordering::Relaxed);
-
-                self.redraw().await;
+            TouchStateAction::Started { pos: _, instant: _ } | TouchStateAction::SetCursorPos => {
+                self.touch_set_cursor_pos(touch_pos).await
             }
             _ => {}
         }
@@ -1390,6 +1399,25 @@ impl ChatEdit {
         true
     }
 
+    async fn touch_set_cursor_pos(&self, mut touch_pos: Point) {
+        debug!(target: "ui::chatedit", "touch_set_cursor_pos({touch_pos:?})");
+        let width = self.wrap_width();
+        {
+            let mut text_wrap = self.text_wrap.lock();
+            let cursor_pos = text_wrap.set_cursor_with_point(touch_pos, width);
+
+            let select = &mut text_wrap.select;
+            select.clear();
+        }
+
+        self.is_phone_select.store(false, Ordering::Relaxed);
+        // Reshow cursor (if hidden)
+        self.pause_blinking();
+        self.hide_cursor.store(false, Ordering::Relaxed);
+
+        self.redraw().await;
+    }
+
     /// Whenever the cursor property is modified this MUST be called
     /// to recalculate the scroll x property.
     fn apply_cursor_scrolling(&self) {
@@ -1468,23 +1496,19 @@ impl ChatEdit {
 
     async fn redraw(&self) {
         //debug!(target: "ui::chatedit", "redraw()");
-
         let Some(draw_update) = self.make_draw_calls() else {
             error!(target: "ui::chatedit", "Text failed to draw");
             return;
         };
-
         self.render_api.replace_draw_calls(draw_update.draw_calls);
     }
 
     fn redraw_cursor(&self) {
         let cursor_instrs = self.get_cursor_instrs();
-
         let draw_calls = vec![(
             self.cursor_dc_key,
             GfxDrawCall { instrs: cursor_instrs, dcs: vec![], z_index: self.z_index.get() },
         )];
-
         self.render_api.replace_draw_calls(draw_calls);
     }
 

bin/darkwallet/src/ui/chatview/mod.rs

@@ -383,7 +383,7 @@ impl ChatView {
 
         let accel = self.scroll_start_accel.get() * dist / time;
         let touch_time = touch_info.start_instant.elapsed();
-        debug!(target: "ui::chatview", "accel = {dist} / {time} = {accel},  touch = {touch_time:?}");
+        //debug!(target: "ui::chatview", "accel = {dist} / {time} = {accel},  touch = {touch_time:?}");
         self.speed.fetch_add(accel, Ordering::Relaxed);
         self.motion_cv.notify();
     }
@@ -676,7 +676,7 @@ impl ChatView {
 
     /// Invalidates cache and redraws everything
     async fn redraw_all(&self) {
-        debug!(target: "ui::chatview", "redraw_all()");
+        //debug!(target: "ui::chatview", "redraw_all()");
 
         let parent_rect = self.parent_rect.lock().unwrap().unwrap().clone();
         self.rect.eval(&parent_rect).expect("unable to eval rect");
@@ -957,7 +957,7 @@ impl UIObject for ChatView {
                     (start_scroll, start_y, start_elapsed, do_update, is_select_mode)
                 };
 
-                debug!(target: "ui::chatview", "touch phase moved, is_select_mode={is_select_mode:?}");
+                //debug!(target: "ui::chatview", "touch phase moved, is_select_mode={is_select_mode:?}");
 
                 // When scrolling if we suddenly grab the screen for more than a brief period
                 // of time then stop the scrolling completely.

bin/darkwallet/src/ui/chatview/page.rs

@@ -693,8 +693,6 @@ impl MessageBuffer {
         let timestamp_font_size = self.timestamp_font_size.get();
         let timestamp_width = self.timestamp_width.get();
 
-        debug!(target: "ui::chatview::page", "{:?}: freeing old textures", self.node());
-
         for msg in &mut self.msgs {
             msg.adjust_params(
                 font_size,

bin/darkwallet/src/ui/editbox/editable.rs

@@ -234,7 +234,7 @@ impl Editable {
         #[cfg(target_os = "android")]
         crate::android::cancel_composition();
 
-        debug!(target: "ui::editbox", "end_compose() [editable={self:?}]");
+        //debug!(target: "ui::editbox", "end_compose() [editable={self:?}]");
         let final_text = self.composer.clear();
         self.before_text += &final_text;
     }

bin/darkwallet/src/ui/mod.rs

@@ -157,7 +157,7 @@ impl<T: Send + Sync + 'static> OnModify<T> {
                     }
                 }
 
-                debug!(target: "app", "Property '{}':{}/'{}' modified", node_name, node_id, prop_name);
+                //debug!(target: "app", "Property '{}':{}/'{}' modified", node_name, node_id, prop_name);
 
                 let Some(self_) = me.upgrade() else {
                     // Should not happen
@@ -167,7 +167,7 @@ impl<T: Send + Sync + 'static> OnModify<T> {
                     );
                 };
 
-                debug!(target: "app", "property modified");
+                //debug!(target: "app", "property modified");
                 f(self_).await;
             }
         });

bin/darkwallet/src/ui/vector_art/mod.rs

@@ -95,11 +95,11 @@ impl VectorArt {
             return;
         };
         self.render_api.replace_draw_calls(draw_update.draw_calls);
-        debug!(target: "ui::vector_art", "replace draw calls done");
+        //debug!(target: "ui::vector_art", "replace draw calls done");
     }
 
     async fn get_draw_calls(&self, parent_rect: Rectangle) -> Option<DrawUpdate> {
-        debug!(target: "ui::vector_art", "VectorArt::draw_cached()");
+        //debug!(target: "ui::vector_art", "VectorArt::draw_cached()");
         self.rect.eval(&parent_rect).ok()?;
         let rect = self.rect.get();
         let verts = self.shape.eval(rect.w, rect.h).expect("bad shape");