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

Fix mouse clicks on remote-open-folder UI (#19851)

Browse source 
Also change Zed's standard style to use
`.track_focus(&self.focus_handle(cx))`, instead of
`.track_focus(&self.focus_handle)`, to catch these kinds of errors more
easily in the future.

Release Notes:

- N/A

---------

Co-authored-by: Conrad <conrad@zed.dev>
This commit is contained in:
Mikayla Maki 2024-10-28 12:55:55 -07:00 • committed by GitHub
parent 826d83edfe
commit 80f89059aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/assistant/src/assistant_panel.rs
View file

@ -4707,7 +4707,7 @@ impl Render for ConfigurationView {
let mut element = v_flex()
.id("assistant-configuration-view")
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.bg(cx.theme().colors().editor_background)
.size_full()
.overflow_y_scroll()

2
crates/collab_ui/src/collab_panel.rs
View file

@ -2726,7 +2726,7 @@ impl Render for CollabPanel {
.on_action(cx.listener(CollabPanel::collapse_selected_channel))
.on_action(cx.listener(CollabPanel::expand_selected_channel))
.on_action(cx.listener(CollabPanel::start_move_selected_channel))
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.size_full()
.child(if self.user_store.read(cx).current_user().is_none() {
self.render_signed_out(cx)

2
crates/copilot/src/sign_in.rs
View file

@ -185,7 +185,7 @@ impl Render for CopilotCodeVerification {
v_flex()
.id("copilot code verification")
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.elevation_3(cx)
.w_96()
.items_center()

2
crates/diagnostics/src/diagnostics.rs
View file

@ -101,7 +101,7 @@ impl Render for ProjectDiagnosticsEditor {
};
div()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.when(self.path_states.is_empty(), |el| {
el.key_context("EmptyPane")
})

4
crates/gpui/examples/input.rs
View file

@ -485,7 +485,7 @@ impl Render for TextInput {
div()
.flex()
.key_context("TextInput")
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.cursor(CursorStyle::IBeam)
.on_action(cx.listener(Self::backspace))
.on_action(cx.listener(Self::delete))
@ -549,7 +549,7 @@ impl Render for InputExample {
let num_keystrokes = self.recent_keystrokes.len();
div()
.bg(rgb(0xaaaaaa))
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.flex()
.flex_col()
.size_full()

2
crates/gpui/src/key_dispatch.rs
View file

@ -16,7 +16,7 @@
/// impl Render for Editor {
/// fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
/// div()
/// .track_focus(&self.focus_handle)
/// .track_focus(&self.focus_handle(cx))
/// .keymap_context("Editor")
/// .on_action(cx.listener(Editor::undo))
/// .on_action(cx.listener(Editor::redo))

2
crates/image_viewer/src/image_viewer.rs
View file

@ -271,7 +271,7 @@ impl Render for ImageView {
.left_0();
div()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.size_full()
.child(checkered_background)
.child(

2
crates/markdown_preview/src/markdown_preview_view.rs
View file

@ -479,7 +479,7 @@ impl Render for MarkdownPreviewView {
v_flex()
.id("MarkdownPreview")
.key_context("MarkdownPreview")
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.size_full()
.bg(cx.theme().colors().editor_background)
.p_4()

2
crates/outline_panel/src/outline_panel.rs
View file

@ -3787,7 +3787,7 @@ impl Render for OutlinePanel {
}
}),
)
.track_focus(&self.focus_handle);
.track_focus(&self.focus_handle(cx));
if self.cached_entries.is_empty() {
let header = if self.updating_fs_entries {

4
crates/picker/src/head.rs
View file

@ -52,8 +52,8 @@ impl EmptyHead {
}
impl Render for EmptyHead {
fn render(&mut self, _: &mut ViewContext<Self>) -> impl IntoElement {
div().track_focus(&self.focus_handle)
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
div().track_focus(&self.focus_handle(cx))
}
}

4
crates/project_panel/src/project_panel.rs
View file

@ -3136,7 +3136,7 @@ impl Render for ProjectPanel {
}
}),
)
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.child(
uniform_list(cx.view().clone(), "entries", item_count, {
|this, range, cx| {
@ -3268,7 +3268,7 @@ impl Render for ProjectPanel {
.id("empty-project_panel")
.size_full()
.p_4()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.child(
Button::new("open_project", "Open a project")
.full_width()

2
crates/recent_projects/src/disconnected_overlay.rs
View file

@ -149,7 +149,7 @@ impl Render for DisconnectedOverlay {
};
div()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.elevation_3(cx)
.on_action(cx.listener(Self::cancel))
.occlude()

2
crates/recent_projects/src/remote_servers.rs
View file

@ -1266,7 +1266,7 @@ impl Render for RemoteServerProjects {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
self.selectable_items.reset();
div()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.elevation_3(cx)
.w(rems(34.))
.key_context("RemoteServerModal")

4
crates/search/src/project_search.rs
View file

@ -327,7 +327,7 @@ impl Render for ProjectSearchView {
div()
.flex_1()
.size_full()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.child(self.results_editor.clone())
} else {
let model = self.model.read(cx);
@ -365,7 +365,7 @@ impl Render for ProjectSearchView {
.size_full()
.justify_center()
.bg(cx.theme().colors().editor_background)
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.child(
h_flex()
.size_full()

2
crates/terminal_view/src/terminal_view.rs
View file

@ -975,7 +975,7 @@ impl Render for TerminalView {
div()
.size_full()
.relative()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.key_context(self.dispatch_context(cx))
.on_action(cx.listener(TerminalView::send_text))
.on_action(cx.listener(TerminalView::send_keystroke))

2
crates/ui/src/components/context_menu.rs
View file

@ -348,7 +348,7 @@ impl Render for ContextMenu {
.min_w(px(200.))
.max_h(vh(0.75, cx))
.overflow_y_scroll()
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.on_mouse_down_out(cx.listener(|this, _, cx| this.cancel(&menu::Cancel, cx)))
.key_context("menu")
.on_action(cx.listener(ContextMenu::select_first))

2
crates/welcome/src/welcome.rs
View file

@ -72,7 +72,7 @@ impl Render for WelcomePage {
h_flex()
.size_full()
.bg(cx.theme().colors().editor_background)
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.child(
v_flex()
.w_80()

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

@ -658,7 +658,7 @@ impl Render for Dock {
div()
.key_context(dispatch_context)
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.flex()
.bg(cx.theme().colors().panel_background)
.border_color(cx.theme().colors().border)
@ -689,7 +689,7 @@ impl Render for Dock {
} else {
div()
.key_context(dispatch_context)
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
}
}
}
@ -826,8 +826,8 @@ pub mod test {
}
impl Render for TestPanel {
fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
div().id("test").track_focus(&self.focus_handle)
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
div().id("test").track_focus(&self.focus_handle(cx))
}
}

4
crates/workspace/src/item.rs
View file

@ -1173,8 +1173,8 @@ pub mod test {
}
impl Render for TestItem {
fn render(&mut self, _: &mut ViewContext<Self>) -> impl IntoElement {
gpui::div().track_focus(&self.focus_handle)
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
gpui::div().track_focus(&self.focus_handle(cx))
}
}

2
crates/workspace/src/pane.rs
View file

@ -2574,7 +2574,7 @@ impl Render for Pane {
v_flex()
.key_context(key_context)
.track_focus(&self.focus_handle)
.track_focus(&self.focus_handle(cx))
.size_full()
.flex_none()
.overflow_hidden()