mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-20 02:47:34 +03:00
Fix bug preventing spaces from being used in filename (zed2)
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
This commit is contained in:
parent
1a1451a943
commit
f922ad9f7f
@ -10,9 +10,9 @@ use anyhow::{anyhow, Result};
|
||||
use gpui::{
|
||||
actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
|
||||
ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, Focusable, FocusableView,
|
||||
InteractiveElement, Model, MouseButton, MouseDownEvent, ParentElement, Pixels, Point,
|
||||
PromptLevel, Render, Stateful, Styled, Subscription, Task, UniformListScrollHandle, View,
|
||||
ViewContext, VisualContext as _, WeakView, WindowContext,
|
||||
InteractiveElement, KeyContext, Model, MouseButton, MouseDownEvent, ParentElement, Pixels,
|
||||
Point, PromptLevel, Render, Stateful, Styled, Subscription, Task, UniformListScrollHandle,
|
||||
View, ViewContext, VisualContext as _, WeakView, WindowContext,
|
||||
};
|
||||
use menu::{Confirm, SelectNext, SelectPrev};
|
||||
use project::{
|
||||
@ -1355,7 +1355,7 @@ impl ProjectPanel {
|
||||
details: EntryDetails,
|
||||
// dragged_entry_destination: &mut Option<Arc<Path>>,
|
||||
cx: &mut ViewContext<Self>,
|
||||
) -> ListItem {
|
||||
) -> Div {
|
||||
let kind = details.kind;
|
||||
let settings = ProjectPanelSettings::get_global(cx);
|
||||
let show_editor = details.is_editing && !details.is_processing;
|
||||
@ -1374,6 +1374,7 @@ impl ProjectPanel {
|
||||
})
|
||||
.unwrap_or(theme.status().info);
|
||||
|
||||
div().key_context(self.dispatch_context(cx)).child(
|
||||
ListItem::new(entry_id.to_proto() as usize)
|
||||
.indent_level(details.depth)
|
||||
.indent_step_size(px(settings.indent_size))
|
||||
@ -1411,7 +1412,8 @@ impl ProjectPanel {
|
||||
}))
|
||||
.on_secondary_mouse_down(cx.listener(move |this, event: &MouseDownEvent, cx| {
|
||||
this.deploy_context_menu(event.position, entry_id, cx);
|
||||
}))
|
||||
})),
|
||||
)
|
||||
// .on_drop::<ProjectEntryId>(|this, event, cx| {
|
||||
// this.move_entry(
|
||||
// *dragged_entry,
|
||||
@ -1421,6 +1423,22 @@ impl ProjectPanel {
|
||||
// );
|
||||
// })
|
||||
}
|
||||
|
||||
fn dispatch_context(&self, cx: &ViewContext<Self>) -> KeyContext {
|
||||
let mut dispatch_context = KeyContext::default();
|
||||
dispatch_context.add("menu");
|
||||
dispatch_context.add("not_editing");
|
||||
|
||||
let identifier = if self.filename_editor.focus_handle(cx).is_focused(cx) {
|
||||
"editing"
|
||||
} else {
|
||||
"not_editing"
|
||||
};
|
||||
|
||||
dispatch_context.add(identifier);
|
||||
|
||||
dispatch_context
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for ProjectPanel {
|
||||
@ -3011,21 +3029,3 @@ mod tests {
|
||||
.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
// TODO - implement this in the new keymap system
|
||||
// fn update_keymap_context(&self, keymap: &mut KeymapContext, cx: &AppContext) {
|
||||
// Self::reset_to_default_keymap_context(keymap);
|
||||
// keymap.add_identifier("menu");
|
||||
|
||||
// if let Some(window) = cx.active_window() {
|
||||
// window.read_with(cx, |cx| {
|
||||
// let identifier = if self.filename_editor.is_focused(cx) {
|
||||
// "editing"
|
||||
// } else {
|
||||
// "not_editing"
|
||||
// };
|
||||
|
||||
// keymap.add_identifier(identifier);
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
|
Loading…
Reference in New Issue
Block a user