Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken merge

Browse source
This commit is contained in:
Mikayla Maki 2023-01-20 09:19:58 -08:00
parent 95e661a78c
commit 97203e1e02
6 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/collab_ui/src/incoming_call_notification.rs
View file

@ -45,7 +45,6 @@ pub fn init(cx: &mut MutableAppContext) {
kind: WindowKind::PopUp, kind: WindowKind::PopUp,
is_movable: false, is_movable: false,
screen: Some(screen), screen: Some(screen),
accepts_first_mouse: true,
}, },
|_| IncomingCallNotification::new(incoming_call.clone()), |_| IncomingCallNotification::new(incoming_call.clone()),
); );

1
crates/collab_ui/src/project_shared_notification.rs
View file

@ -44,7 +44,6 @@ pub fn init(cx: &mut MutableAppContext) {
kind: WindowKind::PopUp, kind: WindowKind::PopUp,
is_movable: false, is_movable: false,
screen: Some(screen), screen: Some(screen),
accepts_first_mouse: true,
}, },
|_| { |_| {
ProjectSharedNotification::new( ProjectSharedNotification::new(

4
crates/gpui/src/platform.rs
View file

@ -156,7 +156,6 @@ pub struct WindowOptions<'a> {
pub kind: WindowKind, pub kind: WindowKind,
pub is_movable: bool, pub is_movable: bool,
pub screen: Option<Rc<dyn Screen>>, pub screen: Option<Rc<dyn Screen>>,
pub accepts_first_mouse: bool,
} }
#[derive(Debug)] #[derive(Debug)]
@ -180,7 +179,7 @@ impl Default for Appearance {
} }
} }
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum WindowKind { pub enum WindowKind {
Normal, Normal,
PopUp, PopUp,
@ -302,7 +301,6 @@ impl<'a> Default for WindowOptions<'a> {
kind: WindowKind::Normal, kind: WindowKind::Normal,
is_movable: true, is_movable: true,
screen: None, screen: None,
accepts_first_mouse: false,
} }
} }
} }

3
crates/gpui/src/platform/mac/window.rs
View file

@ -443,7 +443,7 @@ impl Window {
scene_to_render: Default::default(), scene_to_render: Default::default(),
renderer: Renderer::new(true, fonts), renderer: Renderer::new(true, fonts),
last_fresh_keydown: None, last_fresh_keydown: None,
accepts_first_mouse: matches!(options.kind, WindowKind::PopUp), accepts_first_mouse: options.kind == WindowKind::PopUp,
traffic_light_position: options traffic_light_position: options
.titlebar .titlebar
.as_ref() .as_ref()
@ -451,7 +451,6 @@ impl Window {
previous_modifiers_changed_event: None, previous_modifiers_changed_event: None,
ime_state: ImeState::None, ime_state: ImeState::None,
ime_text: None, ime_text: None,
accepts_first_mouse: options.accepts_first_mouse,
}))); })));
(*native_window).set_ivar( (*native_window).set_ivar(

8
crates/workspace/src/workspace.rs
View file

@ -31,18 +31,14 @@ use futures::{
}; };
use gpui::{ use gpui::{
actions, actions,
color::Color,
elements::*, elements::*,
geometry::{ geometry::vector::Vector2F,
rect::RectF,
vector::{vec2f, Vector2F},
},
impl_actions, impl_internal_actions, impl_actions, impl_internal_actions,
keymap_matcher::KeymapContext, keymap_matcher::KeymapContext,
platform::{CursorStyle, WindowOptions}, platform::{CursorStyle, WindowOptions},
AnyModelHandle, AnyViewHandle, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, AnyModelHandle, AnyViewHandle, AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle,
MouseButton, MutableAppContext, PathPromptOptions, PromptLevel, RenderContext, SizeConstraint, 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 item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ProjectItem};
use language::LanguageRegistry; use language::LanguageRegistry;

1
crates/zed/src/zed.rs
View file

@ -408,7 +408,6 @@ pub fn build_window_options() -> WindowOptions<'static> {
kind: WindowKind::Normal, kind: WindowKind::Normal,
is_movable: true, is_movable: true,
screen: None, screen: None,
accepts_first_mouse: false,
} }
} }