stop palette scroll to bubble up

lapce · May 10, 2024 · 3f69ff4 · 3f69ff4
1 parent c604f51
commit 3f69ff4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,7 +71,7 @@ lapce-core  = { path = "./lapce-core" }
 lapce-rpc   = { path = "./lapce-rpc" }
 lapce-proxy = { path = "./lapce-proxy" }
 
-floem-editor-core = { git = "https://github.com/lapce/floem", rev = "4c2266a9d4466194e17761b374a5f071f14a629e", features = ["serde"] }
+floem-editor-core = { git = "https://github.com/lapce/floem", rev = "9a4c0fa6e1f8412b4a5eb73c8d7f3e0e7dcd9cbc", features = ["serde"] }
 # floem-editor-core = { path = "../workspaces/floem/editor-core/", features = ["serde"] }
 
 [patch.crates-io]

diff --git a/lapce-app/Cargo.toml b/lapce-app/Cargo.toml
@@ -62,7 +62,7 @@ zip            = { version = "0.6.6", default-features = false, features = ["def
 [dependencies.floem]
 # path = "../../workspaces/floem"
 git              = "https://github.com/lapce/floem"
-rev              = "4c2266a9d4466194e17761b374a5f071f14a629e"
+rev              = "9a4c0fa6e1f8412b4a5eb73c8d7f3e0e7dcd9cbc"
 default-features = true
 features         = ["editor", "serde", "default-image-formats", "rfd-async-std"]
 

diff --git a/lapce-app/src/app.rs b/lapce-app/src/app.rs
@@ -2504,7 +2504,11 @@ fn palette_content(
                     index.get() as f64 * palette_item_height,
                 ))
         })
-        .style(|s| s.width_full().min_height(0.0)),
+        .style(|s| {
+            s.width_full()
+                .min_height(0.0)
+                .set(PropagatePointerWheel, false)
+        }),
         text("No matching results").style(move |s| {
             s.display(if items.with(|items| items.is_empty()) {
                 Display::Flex

diff --git a/lapce-app/src/editor/view.rs b/lapce-app/src/editor/view.rs
@@ -30,7 +30,7 @@ use floem::{
             ShowIndentGuide, SmartTab, VisibleWhitespaceColor, WrapProp,
         },
         empty, label,
-        scroll::{scroll, HideBar},
+        scroll::{scroll, HideBar, PropagatePointerWheel},
         stack, svg, Decorators,
     },
     Renderer, View, ViewId,
@@ -1877,7 +1877,11 @@ fn editor_content(
             rect
         }
     })
-    .style(|s| s.absolute().size_pct(100.0, 100.0))
+    .style(|s| {
+        s.absolute()
+            .size_pct(100.0, 100.0)
+            .set(PropagatePointerWheel, false)
+    })
 }
 
 fn search_editor_view(