zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace usages of is_parent_view_focused with is_self_focused

Browse Source 
Previously, this was used because we didn't have access to the current
view and `EventContext` was an element-only abstraction. Now that the
`EventContext` wraps the current view's `ViewContext` we can simply check
for the view's focus and avoid querying ancestors.
This commit is contained in:
Antonio Scandurra 2023-05-05 10:08:22 +02:00
parent 80ad59a620
commit b9ed327b94
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/gpui/src/app.rs
View File

@ -2859,14 +2859,6 @@ impl<'a, 'b, V: View> ViewContext<'a, 'b, V> {
self.window.focused_view_id == Some(self.view_id) self.window.focused_view_id == Some(self.view_id)
} }
pub fn is_parent_view_focused(&self) -> bool {
if let Some(parent_view_id) = self.ancestors(self.view_id).next().clone() {
self.focused_view_id() == Some(parent_view_id)
} else {
false
}
}
pub fn focus_parent(&mut self) { pub fn focus_parent(&mut self) {
let window_id = self.window_id; let window_id = self.window_id;
let view_id = self.view_id; let view_id = self.view_id;

4
crates/terminal_view/src/terminal_element.rs
View File

@ -408,7 +408,7 @@ impl TerminalElement {
) )
// Update drag selections // Update drag selections
.on_drag(MouseButton::Left, move |event, _: &mut TerminalView, cx| { .on_drag(MouseButton::Left, move |event, _: &mut TerminalView, cx| {
if cx.is_parent_view_focused() { if cx.is_self_focused() {
if let Some(conn_handle) = connection.upgrade(cx) { if let Some(conn_handle) = connection.upgrade(cx) {
conn_handle.update(cx, |terminal, cx| { conn_handle.update(cx, |terminal, cx| {
terminal.mouse_drag(event, origin); terminal.mouse_drag(event, origin);
@ -444,7 +444,7 @@ impl TerminalElement {
}, },
) )
.on_move(move |event, _: &mut TerminalView, cx| { .on_move(move |event, _: &mut TerminalView, cx| {
if cx.is_parent_view_focused() { if cx.is_self_focused() {
if let Some(conn_handle) = connection.upgrade(cx) { if let Some(conn_handle) = connection.upgrade(cx) {
conn_handle.update(cx, |terminal, cx| { conn_handle.update(cx, |terminal, cx| {
terminal.mouse_move(&event, origin); terminal.mouse_move(&event, origin);