From 97203e1e02fdf3c25d5ffd037d495947a74ac6d5 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@gmail.com>
Date: Fri, 20 Jan 2023 09:19:58 -0800
Subject: [PATCH] Fix broken merge

---
 crates/collab_ui/src/incoming_call_notification.rs  | 1 -
 crates/collab_ui/src/project_shared_notification.rs | 1 -
 crates/gpui/src/platform.rs                         | 4 +---
 crates/gpui/src/platform/mac/window.rs              | 3 +--
 crates/workspace/src/workspace.rs                   | 8 ++------
 crates/zed/src/zed.rs                               | 1 -
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/crates/collab_ui/src/incoming_call_notification.rs b/crates/collab_ui/src/incoming_call_notification.rs
index f0daa3c7e8617040d10a616b2f6353b068310ece..6ad533665e7477494e221da71f85a31646671447 100644
--- a/crates/collab_ui/src/incoming_call_notification.rs
+++ b/crates/collab_ui/src/incoming_call_notification.rs
@@ -45,7 +45,6 @@ pub fn init(cx: &mut MutableAppContext) {
                             kind: WindowKind::PopUp,
                             is_movable: false,
                             screen: Some(screen),
-                            accepts_first_mouse: true,
                         },
                         |_| IncomingCallNotification::new(incoming_call.clone()),
                     );
diff --git a/crates/collab_ui/src/project_shared_notification.rs b/crates/collab_ui/src/project_shared_notification.rs
index 858886a0e3e5ba7669e476ed6202ba20f72c011f..0815d9c8d8c02c6756f65c61ca0b4c5187d0b016 100644
--- a/crates/collab_ui/src/project_shared_notification.rs
+++ b/crates/collab_ui/src/project_shared_notification.rs
@@ -44,7 +44,6 @@ pub fn init(cx: &mut MutableAppContext) {
                         kind: WindowKind::PopUp,
                         is_movable: false,
                         screen: Some(screen),
-                        accepts_first_mouse: true,
                     },
                     |_| {
                         ProjectSharedNotification::new(
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index ad4d7542d300ce9c64db6fb0d2de7f628f56337e..99d607e4070c5eebb2039dba3754e6100a59b30a 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -156,7 +156,6 @@ pub struct WindowOptions<'a> {
     pub kind: WindowKind,
     pub is_movable: bool,
     pub screen: Option<Rc<dyn Screen>>,
-    pub accepts_first_mouse: bool,
 }
 
 #[derive(Debug)]
@@ -180,7 +179,7 @@ impl Default for Appearance {
     }
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum WindowKind {
     Normal,
     PopUp,
@@ -302,7 +301,6 @@ impl<'a> Default for WindowOptions<'a> {
             kind: WindowKind::Normal,
             is_movable: true,
             screen: None,
-            accepts_first_mouse: false,
         }
     }
 }
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index f5a21c46440a4b4f1e45276a181f37e3b018dfe0..26305e86da7fe08e645b12536581934e18e15a38 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -443,7 +443,7 @@ impl Window {
                 scene_to_render: Default::default(),
                 renderer: Renderer::new(true, fonts),
                 last_fresh_keydown: None,
-                accepts_first_mouse: matches!(options.kind, WindowKind::PopUp),
+                accepts_first_mouse: options.kind == WindowKind::PopUp,
                 traffic_light_position: options
                     .titlebar
                     .as_ref()
@@ -451,7 +451,6 @@ impl Window {
                 previous_modifiers_changed_event: None,
                 ime_state: ImeState::None,
                 ime_text: None,
-                accepts_first_mouse: options.accepts_first_mouse,
             })));
 
             (*native_window).set_ivar(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 9665db6be60955af11c10979cad87bbc23a29ed5..8735f33fbe6cfd3197bd825e8c5abc01652eea46 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -31,18 +31,14 @@ use futures::{
 };
 use gpui::{
     actions,
-    color::Color,
     elements::*,
-    geometry::{
-        rect::RectF,
-        vector::{vec2f, Vector2F},
-    },
+    geometry::vector::Vector2F,
     impl_actions, impl_internal_actions,
     keymap_matcher::KeymapContext,
     platform::{CursorStyle, WindowOptions},
     AnyModelHandle, AnyViewHandle, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle,
     MouseButton, MutableAppContext, PathPromptOptions, PromptLevel, RenderContext, SizeConstraint,
-    Task, View, ViewContext, ViewHandle, WeakViewHandle, WindowBounds, WindowKind,
+    Task, View, ViewContext, ViewHandle, WeakViewHandle,
 };
 use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ProjectItem};
 use language::LanguageRegistry;
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 248bab5fdacb58fdf5f5f715932cf4d0598b7691..c3af91306dce4b1ba79bf46f52fdce79daa34cff 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -408,7 +408,6 @@ pub fn build_window_options() -> WindowOptions<'static> {
         kind: WindowKind::Normal,
         is_movable: true,
         screen: None,
-        accepts_first_mouse: false,
     }
 }