improve text composition

yatli · Jul 17, 2021 · cecd5f9 · cecd5f9
1 parent 310e87d
commit cecd5f9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ViewModels/GridViewModel.fs b/ViewModels/GridViewModel.fs
@@ -474,7 +474,7 @@ and GridViewModel(_gridid: int, ?_parent: GridViewModel, ?_gridsize: GridSize) a
             m_cursor_vm.row <- row
             m_cursor_vm.col <- col
             cursorConfig()
-        elif m_cursor_vm.focused then
+        elif m_cursor_vm.focused && not(states.ui_multigrid && _gridid = 1) then
             m_cursor_vm.focused <- false
             m_cursor_vm.RenderTick <- m_cursor_vm.RenderTick + 1
 

diff --git a/Views/Grid.xaml.fs b/Views/Grid.xaml.fs
@@ -308,8 +308,16 @@ type Grid() as this =
           draw row r.col r.col_end
     )
     let mutable drawn = vm.DrawOps.Count <> 0
-    // for the base grid, do not block drawing of children
+    // for the base grid, do not block drawing of children, and
+    // mark child grid dirty if base updates overlapped it
     if vm.GridId = grid_vm.GridId then
+        for cgrid in vm.ChildGrids do
+            let touched = _drawnRegions 
+                          |> Seq.exists(fun(r,c,ce) -> 
+                          cgrid.AnchorRow <= r &&
+                          r < cgrid.AnchorRow + cgrid.Rows &&
+                          not( cgrid.AnchorCol >= ce || c >= cgrid.AnchorCol + cgrid.Cols ))
+            if touched then cgrid.MarkAllDirty()
         _drawnRegions.Clear()
     for c in vm.ChildGrids do
         let child_drawn = drawOps c