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

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

@ -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(