mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-30 22:34:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Keybaord shortcut context menu

Browse source
This commit is contained in:
Conrad Irwin 2023-11-29 23:04:33 -07:00
parent a37f86f294
commit 54cfcef0aa
2 changed files with 87 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
crates/collab_ui2/src/collab_panel.rs
View file

@ -385,10 +385,6 @@ enum ListEntry {
ContactPlaceholder, ContactPlaceholder,
} }
// impl Entity for CollabPanel {
// type Event = Event;
// }
impl CollabPanel { impl CollabPanel {
pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> { pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
cx.build_view(|cx| { cx.build_view(|cx| {
@ -1079,71 +1075,71 @@ impl CollabPanel {
self.entries.push(ListEntry::ContactPlaceholder); self.entries.push(ListEntry::ContactPlaceholder);
} }
// if select_same_item { // if select_same_item {
// if let Some(prev_selected_entry) = prev_selected_entry { // if let Some(prev_selected_entry) = prev_selected_entry {
// self.selection.take(); // self.selection.take();
// for (ix, entry) in self.entries.iter().enumerate() { // for (ix, entry) in self.entries.iter().enumerate() {
// if *entry == prev_selected_entry { // if *entry == prev_selected_entry {
// self.selection = Some(ix); // self.selection = Some(ix);
// break; // break;
// }
// }
// } // }
// } else {
// self.selection = self.selection.and_then(|prev_selection| {
// if self.entries.is_empty() {
// None
// } else {
// Some(prev_selection.min(self.entries.len() - 1))
// }
// });
// } // }
// }
// let old_scroll_top = self.list_state.logical_scroll_top(); // } else {
// self.selection = self.selection.and_then(|prev_selection| {
// self.list_state.reset(self.entries.len()); // if self.entries.is_empty() {
// None
// if scroll_to_top {
// self.list_state.scroll_to(ListOffset::default());
// } else { // } else {
// // Attempt to maintain the same scroll position. // Some(prev_selection.min(self.entries.len() - 1))
// if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) { // }
// let new_scroll_top = self // });
// }
// let old_scroll_top = self.list_state.logical_scroll_top();
// self.list_state.reset(self.entries.len());
// if scroll_to_top {
// self.list_state.scroll_to(ListOffset::default());
// } else {
// // Attempt to maintain the same scroll position.
// if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
// let new_scroll_top = self
// .entries
// .iter()
// .position(|entry| entry == old_top_entry)
// .map(|item_ix| ListOffset {
// item_ix,
// offset_in_item: old_scroll_top.offset_in_item,
// })
// .or_else(|| {
// let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
// let item_ix = self
// .entries // .entries
// .iter() // .iter()
// .position(|entry| entry == old_top_entry) // .position(|entry| entry == entry_after_old_top)?;
// .map(|item_ix| ListOffset { // Some(ListOffset {
// item_ix, // item_ix,
// offset_in_item: old_scroll_top.offset_in_item, // offset_in_item: 0.,
// }) // })
// .or_else(|| { // })
// let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?; // .or_else(|| {
// let item_ix = self // let entry_before_old_top =
// .entries // old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
// .iter() // let item_ix = self
// .position(|entry| entry == entry_after_old_top)?; // .entries
// Some(ListOffset { // .iter()
// item_ix, // .position(|entry| entry == entry_before_old_top)?;
// offset_in_item: 0., // Some(ListOffset {
// }) // item_ix,
// }) // offset_in_item: 0.,
// .or_else(|| { // })
// let entry_before_old_top = // });
// old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
// let item_ix = self
// .entries
// .iter()
// .position(|entry| entry == entry_before_old_top)?;
// Some(ListOffset {
// item_ix,
// offset_in_item: 0.,
// })
// });
// self.list_state // self.list_state
// .scroll_to(new_scroll_top.unwrap_or(old_scroll_top)); // .scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
// } // }
// } // }
cx.notify(); cx.notify();
} }
@ -1687,8 +1683,6 @@ impl CollabPanel {
ix: usize, ix: usize,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) { ) {
// self.context_menu_on_selected = position.is_none();
let clipboard_channel_name = self.channel_clipboard.as_ref().and_then(|clipboard| { let clipboard_channel_name = self.channel_clipboard.as_ref().and_then(|clipboard| {
self.channel_store self.channel_store
.read(cx) .read(cx)
@ -1779,10 +1773,16 @@ impl CollabPanel {
}); });
cx.focus_view(&context_menu); cx.focus_view(&context_menu);
let subscription = cx.subscribe(&context_menu, |this, _, _: &DismissEvent, cx| { let subscription =
this.context_menu.take(); cx.subscribe(&context_menu, |this, _, _: &DismissEvent, cx| {
cx.notify(); if this.context_menu.as_ref().is_some_and(|context_menu| {
}); context_menu.0.focus_handle(cx).contains_focused(cx)
}) {
cx.focus_self();
}
this.context_menu.take();
cx.notify();
});
self.context_menu = Some((context_menu, position, subscription)); self.context_menu = Some((context_menu, position, subscription));
cx.notify(); cx.notify();
@ -2147,8 +2147,15 @@ impl CollabPanel {
let Some(channel) = self.selected_channel() else { let Some(channel) = self.selected_channel() else {
return; return;
}; };
let Some(bounds) = self
.selection
.and_then(|ix| self.scroll_handle.bounds_for_item(ix))
else {
return;
};
self.deploy_channel_context_menu(todo!(), channel.id, self.selection.unwrap(), cx); self.deploy_channel_context_menu(bounds.center(), channel.id, self.selection.unwrap(), cx);
cx.stop_propagation();
} }
fn selected_channel(&self) -> Option<&Arc<Channel>> { fn selected_channel(&self) -> Option<&Arc<Channel>> {
@ -3258,6 +3265,12 @@ impl Render for CollabPanel {
} else { } else {
self.render_signed_in(cx) self.render_signed_in(cx)
}) })
.children(self.context_menu.as_ref().map(|(menu, position, _)| {
overlay()
.position(*position)
.anchor(gpui::AnchorCorner::TopLeft)
.child(menu.clone())
}))
} }
} }

4
crates/gpui2/src/elements/div.rs
View file

@ -1492,6 +1492,10 @@ impl ScrollHandle {
} }
} }
pub fn bounds_for_item(&self, ix: usize) -> Option<Bounds<Pixels>> {
self.0.borrow().child_bounds.get(ix).cloned()
}
/// scroll_to_item scrolls the minimal amount to ensure that the item is /// scroll_to_item scrolls the minimal amount to ensure that the item is
/// fully visible /// fully visible
pub fn scroll_to_item(&self, ix: usize) { pub fn scroll_to_item(&self, ix: usize) {