still update focus if pointerdown was processed

lapce · Jun 13, 2024 · 9a9e6c2 · 9a9e6c2
1 parent 0e1cb1d
commit 9a9e6c2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/context.rs b/src/context.rs
@@ -146,6 +146,15 @@ impl<'a> EventCx<'a> {
             .event_before_children(self, &event)
             .is_processed()
         {
+            if let Event::PointerDown(event) = &event {
+                if self.app_state.keyboard_navigable.contains(&view_id) {
+                    let rect = view_id.get_size().unwrap_or_default().to_rect();
+                    let now_focused = rect.contains(event.pos);
+                    if now_focused {
+                        self.app_state.update_focus(view_id, false);
+                    }
+                }
+            }
             return EventPropagation::Stop;
         }
 

diff --git a/src/renderer.rs b/src/renderer.rs
@@ -68,14 +68,10 @@ impl<W: wgpu::WindowHandle> Renderer<W> {
     {
         let size = Size::new(size.width.max(1.0), size.height.max(1.0));
 
-        let force_tiny_skia = if let Some(val) = std::env::var("FLOEM_FORCE_TINY_SKIA")
+        let force_tiny_skia = std::env::var("FLOEM_FORCE_TINY_SKIA")
             .ok()
             .map(|val| val.as_str() == "1")
-        {
-            val
-        } else {
-            false
-        };
+            .unwrap_or(false);
 
         let vger_err = if !force_tiny_skia {
             match VgerRenderer::new(window.clone(), size.width as u32, size.height as u32, scale) {