From 25564ea0585120863ba80e8c58eacaa27fbf8c2a Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 5 Jul 2023 09:39:04 +0200
Subject: [PATCH] Introduce a `WindowContext::focus` method that implies the
 window id

---
 crates/context_menu/src/context_menu.rs | 3 +--
 crates/gpui/src/app.rs                  | 9 +++------
 crates/gpui/src/app/window.rs           | 4 ++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/context_menu/src/context_menu.rs b/crates/context_menu/src/context_menu.rs
index 296f6bc04a..f58afab361 100644
--- a/crates/context_menu/src/context_menu.rs
+++ b/crates/context_menu/src/context_menu.rs
@@ -244,8 +244,7 @@ impl ContextMenu {
             let show_count = self.show_count;
             cx.defer(move |this, cx| {
                 if cx.handle().is_focused(cx) && this.show_count == show_count {
-                    let window_id = cx.window_id();
-                    (**cx).focus(window_id, this.previously_focused_view_id.take());
+                    (**cx).focus(this.previously_focused_view_id.take());
                 }
             });
         } else {
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 20043a9093..fec2ca595b 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -2971,14 +2971,12 @@ impl<'a, 'b, V: View> ViewContext<'a, 'b, V> {
     }
 
     pub fn focus(&mut self, handle: &AnyViewHandle) {
-        self.window_context
-            .focus(handle.window_id, Some(handle.view_id));
+        self.window_context.focus(Some(handle.view_id));
     }
 
     pub fn focus_self(&mut self) {
-        let window_id = self.window_id;
         let view_id = self.view_id;
-        self.window_context.focus(window_id, Some(view_id));
+        self.window_context.focus(Some(view_id));
     }
 
     pub fn is_self_focused(&self) -> bool {
@@ -2997,8 +2995,7 @@ impl<'a, 'b, V: View> ViewContext<'a, 'b, V> {
     }
 
     pub fn blur(&mut self) {
-        let window_id = self.window_id;
-        self.window_context.focus(window_id, None);
+        self.window_context.focus(None);
     }
 
     pub fn on_window_should_close<F>(&mut self, mut callback: F)
diff --git a/crates/gpui/src/app/window.rs b/crates/gpui/src/app/window.rs
index 743f99ee62..4edfa5b284 100644
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@@ -1096,6 +1096,10 @@ impl<'a> WindowContext<'a> {
         self.window.focused_view_id
     }
 
+    pub fn focus(&mut self, view_id: Option<usize>) {
+        self.app_context.focus(self.window_id, view_id);
+    }
+
     pub fn window_bounds(&self) -> WindowBounds {
         self.window.platform_window.bounds()
     }