From 73afb29b0491b71cec4254f127192cc8ecb30024 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Tue, 23 Nov 2021 16:23:30 -0700
Subject: [PATCH] Use alt modifier instead of cmd to add selections

---
 crates/editor/src/element.rs          | 9 +++++----
 crates/gpui/src/app.rs                | 2 ++
 crates/gpui/src/platform/event.rs     | 4 +++-
 crates/gpui/src/platform/mac/event.rs | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index c5e1dd797f..87b8001b38 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -55,8 +55,8 @@ impl EditorElement {
     fn mouse_down(
         &self,
         position: Vector2F,
+        alt: bool,
         shift: bool,
-        cmd: bool,
         mut click_count: usize,
         layout: &mut LayoutState,
         paint: &mut PaintState,
@@ -79,7 +79,7 @@ impl EditorElement {
         } else {
             cx.dispatch_action(Select(SelectPhase::Begin {
                 position,
-                add: cmd,
+                add: alt,
                 click_count,
             }));
         }
@@ -861,10 +861,11 @@ impl Element for EditorElement {
             match event {
                 Event::LeftMouseDown {
                     position,
+                    alt,
                     shift,
-                    cmd,
                     click_count,
-                } => self.mouse_down(*position, *shift, *cmd, *click_count, layout, paint, cx),
+                    ..
+                } => self.mouse_down(*position, *alt, *shift, *click_count, layout, paint, cx),
                 Event::LeftMouseUp { position } => self.mouse_up(*position, cx),
                 Event::LeftMouseDragged { position } => {
                     self.mouse_dragged(*position, layout, paint, cx)
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index e34ed6877d..0e2e313db0 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -3650,6 +3650,8 @@ mod tests {
         presenter.borrow_mut().dispatch_event(
             Event::LeftMouseDown {
                 position: Default::default(),
+                ctrl: false,
+                alt: false,
                 shift: false,
                 cmd: false,
                 click_count: 1,
diff --git a/crates/gpui/src/platform/event.rs b/crates/gpui/src/platform/event.rs
index 08f84765bc..d780ff10a8 100644
--- a/crates/gpui/src/platform/event.rs
+++ b/crates/gpui/src/platform/event.rs
@@ -14,8 +14,10 @@ pub enum Event {
     },
     LeftMouseDown {
         position: Vector2F,
-        cmd: bool,
+        ctrl: bool,
+        alt: bool,
         shift: bool,
+        cmd: bool,
         click_count: usize,
     },
     LeftMouseUp {
diff --git a/crates/gpui/src/platform/mac/event.rs b/crates/gpui/src/platform/mac/event.rs
index 4e25dd7de7..6adb85f191 100644
--- a/crates/gpui/src/platform/mac/event.rs
+++ b/crates/gpui/src/platform/mac/event.rs
@@ -92,6 +92,8 @@ impl Event {
                         native_event.locationInWindow().x as f32,
                         window_height - native_event.locationInWindow().y as f32,
                     ),
+                    ctrl: modifiers.contains(NSEventModifierFlags::NSControlKeyMask),
+                    alt: modifiers.contains(NSEventModifierFlags::NSAlternateKeyMask),
                     shift: modifiers.contains(NSEventModifierFlags::NSShiftKeyMask),
                     cmd: modifiers.contains(NSEventModifierFlags::NSCommandKeyMask),
                     click_count: native_event.clickCount() as usize,