diff --git a/Cargo.lock b/Cargo.lock index a277f017108ce7d3f7bd510fa00d7b1914696df4..07a058a4032ecea1d85c2571c246767a373e0193 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6451,13 +6451,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "focus_follows_mouse" -version = "0.1.0" -dependencies = [ - "gpui", -] - [[package]] name = "foldhash" version = "0.1.5" @@ -21528,7 +21521,6 @@ dependencies = [ "component", "db", "feature_flags", - "focus_follows_mouse", "fs", "futures 0.3.31", "git", diff --git a/Cargo.toml b/Cargo.toml index 93242885ef2437c5bbcd544a26ebf0eb0f734b15..17efe21800962cf5c7cd1b21b2e7c7a0c8df4c12 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,7 +78,6 @@ members = [ "crates/feedback", "crates/file_finder", "crates/file_icons", - "crates/focus_follows_mouse", "crates/fs", "crates/fs_benchmarks", "crates/fuzzy", diff --git a/crates/focus_follows_mouse/Cargo.toml b/crates/focus_follows_mouse/Cargo.toml deleted file mode 100644 index e5be3eee0edcad4b5a7911e5fd8964e403d0408d..0000000000000000000000000000000000000000 --- a/crates/focus_follows_mouse/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "focus_follows_mouse" -version = "0.1.0" -publish.workspace = true -edition.workspace = true - -[lib] -path = "src/focus_follows_mouse.rs" - -[dependencies] -gpui.workspace = true - -[lints] -workspace = true diff --git a/crates/focus_follows_mouse/LICENSE-GPL b/crates/focus_follows_mouse/LICENSE-GPL deleted file mode 100644 index 89e542f750cd3860a0598eff0dc34b56d7336dc4..0000000000000000000000000000000000000000 --- a/crates/focus_follows_mouse/LICENSE-GPL +++ /dev/null @@ -1 +0,0 @@ -../../LICENSE-GPL \ No newline at end of file diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index ae36e89770ff449a34d50896514fb61d4c853698..d5e9400353eee50b3c5734a31684abdb0149caa0 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -67,7 +67,6 @@ util.workspace = true uuid.workspace = true vim_mode_setting.workspace = true zed_actions.workspace = true -focus_follows_mouse = { version = "0.1.0", path = "../focus_follows_mouse" } [target.'cfg(target_os = "windows")'.dependencies] windows.workspace = true diff --git a/crates/focus_follows_mouse/src/focus_follows_mouse.rs b/crates/workspace/src/focus_follows_mouse.rs similarity index 100% rename from crates/focus_follows_mouse/src/focus_follows_mouse.rs rename to crates/workspace/src/focus_follows_mouse.rs diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index 900b02060a22c790671983b464eafe9f9f47241e..6c6ed23520d46cfa20b8f7c3bf251f998c02a100 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -2,6 +2,7 @@ use crate::{ CloseWindow, NewFile, NewTerminal, OpenInTerminal, OpenOptions, OpenTerminal, OpenVisible, SplitDirection, ToggleFileFinder, ToggleProjectSymbols, ToggleZoom, Workspace, WorkspaceItemBuilder, ZoomIn, ZoomOut, + focus_follows_mouse::FocusFollowsMouse, invalid_item_view::InvalidItemView, item::{ ActivateOnClose, ClosePosition, Item, ItemBufferKind, ItemHandle, ItemSettings, @@ -15,7 +16,6 @@ use crate::{ }; use anyhow::Result; use collections::{BTreeSet, HashMap, HashSet, VecDeque}; -use focus_follows_mouse::FocusFollowsMouse; use futures::{StreamExt, stream::FuturesUnordered}; use gpui::{ Action, AnyElement, App, AsyncWindowContext, ClickEvent, ClipboardItem, Context, Corner, Div, diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index d5cb3bf5e63ff333cd050f75536bf8de18ff372e..3dd6c8401b0d3df29fa500262e1817b6fdf1cb2d 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -16,6 +16,7 @@ mod security_modal; pub mod shared_screen; use db::smol::future::yield_now; pub use shared_screen::SharedScreen; +pub mod focus_follows_mouse; mod status_bar; pub mod tasks; mod theme_preview;