app/menu: center icons at padding

bin/app/src/app/schema/menu.rs

@@ -43,7 +43,7 @@ mod android_ui_consts {
     pub const CHANNEL_LABEL_LINESPACE: f32 = 140.;
     pub const CHANNEL_LABEL_FONTSIZE: f32 = 44.;
     pub const MENU_SEP_SIZE: f32 = 3.;
-    pub const MENU_HANDLE_PAD: f32 = 100.;
+    pub const MENU_HANDLE_PAD: f32 = 200.;
     pub const VERBLOCK_SCALE: f32 = 150.;
     pub const VERBLOCK_X: f32 = 180.;
     pub const VERBLOCK_Y: f32 = 80.;
@@ -69,7 +69,7 @@ mod ui_consts {
     pub const CHANNEL_LABEL_LINESPACE: f32 = 60.;
     pub const CHANNEL_LABEL_FONTSIZE: f32 = 22.;
     pub const MENU_SEP_SIZE: f32 = 1.;
-    pub const MENU_HANDLE_PAD: f32 = 50.;
+    pub const MENU_HANDLE_PAD: f32 = 100.;
     pub const VERBLOCK_SCALE: f32 = 80.;
     pub const VERBLOCK_X: f32 = 110.;
     pub const VERBLOCK_Y: f32 = 50.;

bin/app/src/ui/menu/mod.rs

@@ -133,6 +133,9 @@ pub struct Menu {
     mouse_pos: SyncMutex<Point>,
     touch_info: SyncMutex<Option<TouchInfo>>,
     mouse_click_info: SyncMutex<Option<MouseClickInfo>>,
+    long_press_task: SyncMutex<Option<smol::Task<()>>>,
+    weak_self: SyncMutex<Option<Weak<Self>>>,
+    ex: SyncMutex<Option<ExecutorPtr>>,
     scroll_start_accel: PropertyFloat32,
     scroll_resist: PropertyFloat32,
     motion_cv: Arc<CondVar>,
@@ -199,6 +202,9 @@ impl Menu {
             mouse_pos: SyncMutex::new(Point::new(0., 0.)),
             touch_info: SyncMutex::new(None),
             mouse_click_info: SyncMutex::new(None),
+            long_press_task: SyncMutex::new(None),
+            weak_self: SyncMutex::new(None),
+            ex: SyncMutex::new(None),
             scroll_start_accel,
             scroll_resist,
             motion_cv,
@@ -308,7 +314,7 @@ impl Menu {
 
         let item_states = self.item_states.lock();
         let is_edit_mode = self.is_edit_mode.load(Ordering::Relaxed);
-        let edit_offset = if is_edit_mode { 100.0 } else { 0.0 };
+        let edit_offset = if is_edit_mode { handle_padding } else { 0.0 };
 
         // Create X mesh for edit mode
         let x_mesh =
@@ -317,11 +323,11 @@ impl Menu {
         let mut edit_instrs = vec![];
         if is_edit_mode {
             let item_center_y = item_height / 2.0;
-            edit_instrs.push(DrawInstruction::Move(Point::new(handle_padding, item_center_y)));
+            edit_instrs.push(DrawInstruction::Move(Point::new(handle_padding / 2., item_center_y)));
             edit_instrs.push(DrawInstruction::Draw(shape::make_x(&self.renderer, font_size)));
-            edit_instrs.push(DrawInstruction::Move(Point::new(-handle_padding, -item_center_y)));
+            edit_instrs.push(DrawInstruction::Move(Point::new(-handle_padding / 2., -item_center_y)));
 
-            let rhs = rect.w - handle_padding;
+            let rhs = rect.w - handle_padding / 2.;
             edit_instrs.push(DrawInstruction::Move(Point::new(rhs, item_center_y)));
             edit_instrs.push(DrawInstruction::Draw(shape::make_hammy(&self.renderer, font_size)));
             edit_instrs.push(DrawInstruction::Move(Point::new(-rhs, -item_center_y)));
@@ -547,6 +553,8 @@ impl UIObject for Menu {
     }
 
     async fn start(self: Arc<Self>, ex: ExecutorPtr) {
+        *self.weak_self.lock() = Some(Arc::downgrade(&self));
+        *self.ex.lock() = Some(ex.clone());
         let me = Arc::downgrade(&self);
         let node_ref = &self.node.upgrade().unwrap();
 
@@ -624,6 +632,36 @@ impl UIObject for Menu {
         *self.mouse_click_info.lock() =
             Some(MouseClickInfo { start_pos: mouse_pos, start_instant: std::time::Instant::now() });
 
+        // Spawn a task to detect long press
+        let weak_self = self.weak_self.lock().clone().unwrap();
+        let start_pos = mouse_pos;
+
+        let ex = self.ex.lock().clone().unwrap();
+        let long_press_task = ex.spawn(async move {
+            darkfi::system::msleep(500).await;
+
+            let Some(arc_self) = weak_self.upgrade() else { return };
+            let current_mouse_pos = *arc_self.mouse_pos.lock();
+            let click_info = arc_self.mouse_click_info.lock();
+
+            // Check if button is still held and movement is within threshold
+            if let Some(info) = &*click_info {
+                let movement_dist = ((current_mouse_pos.x - start_pos.x).powi(2) +
+                    (current_mouse_pos.y - start_pos.y).powi(2))
+                .sqrt();
+
+                if movement_dist < LONG_PRESS_EPSILON {
+                    // Long press detected, trigger edit mode
+                    drop(click_info);
+                    arc_self.is_edit_mode.store(true, Ordering::Release);
+                    let atom = &mut arc_self.renderer.make_guard(gfxtag!("Menu::long_press"));
+                    arc_self.redraw(atom);
+                }
+            }
+        });
+
+        *self.long_press_task.lock() = Some(long_press_task);
+
         false
     }
 
@@ -632,6 +670,12 @@ impl UIObject for Menu {
             return false
         }
 
+        // Cancel the long press detection task
+        let task = self.long_press_task.lock().take();
+        if let Some(task) = task {
+            task.cancel().await;
+        }
+
         let click_info = self.mouse_click_info.lock().take();
         let Some(info) = click_info else { return false };
 

bin/app/src/ui/menu/shape.rs

@@ -18,7 +18,7 @@
 
 use crate::{
     gfx::{gfxtag, DrawMesh, Renderer, Vertex},
-    mesh::{Color, MeshBuilder},
+    mesh::{Color, MeshBuilder, COLOR_GREEN},
 };
 
 const X_COLOR: Color = [1.0, 0.0, 0.0, 1.0];
@@ -39,13 +39,13 @@ pub fn make_x(renderer: &Renderer, font_size: f32) -> DrawMesh {
     let mut diag_start2 = [-half_size + half_thick, -half_size - half_thick];
     let mut diag_end2 = [half_size + half_thick, half_size - half_thick];
 
-    let verts1 = vec![
+    let verts = vec![
         Vertex { pos: diag_start, color: X_COLOR, uv: [0., 0.] },
         Vertex { pos: diag_end, color: X_COLOR, uv: [0., 0.] },
         Vertex { pos: diag_start2, color: X_COLOR, uv: [0., 0.] },
         Vertex { pos: diag_end2, color: X_COLOR, uv: [0., 0.] },
     ];
-    mesh.append(verts1, vec![0, 2, 1, 1, 2, 3]);
+    mesh.append(verts, vec![0, 2, 1, 1, 2, 3]);
 
     // Second diagonal line (bottom-left to top-right)
     // Diagonal from (-half_size, half_size) to (half_size, -half_size)
@@ -54,13 +54,21 @@ pub fn make_x(renderer: &Renderer, font_size: f32) -> DrawMesh {
     diag_start2[0] *= -1.;
     diag_end2[0] *= -1.;
 
-    let verts2 = vec![
+    let verts = vec![
         Vertex { pos: diag_start, color: X_COLOR, uv: [0., 0.] },
         Vertex { pos: diag_end, color: X_COLOR, uv: [0., 0.] },
         Vertex { pos: diag_start2, color: X_COLOR, uv: [0., 0.] },
         Vertex { pos: diag_end2, color: X_COLOR, uv: [0., 0.] },
     ];
-    mesh.append(verts2, vec![0, 2, 1, 1, 2, 3]);
+    mesh.append(verts, vec![0, 2, 1, 1, 2, 3]);
+
+    let verts = vec![
+        Vertex { pos: [-5., -5.], color: COLOR_GREEN, uv: [0., 0.] },
+        Vertex { pos: [-5., 5.], color: COLOR_GREEN, uv: [0., 0.] },
+        Vertex { pos: [5., -5.], color: COLOR_GREEN, uv: [0., 0.] },
+        Vertex { pos: [5., 5.], color: COLOR_GREEN, uv: [0., 0.] },
+    ];
+    mesh.append(verts, vec![0, 2, 1, 1, 2, 3]);
 
     mesh.alloc(renderer).draw_untextured()
 }