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

Add overflow menu to the git panel (#25618)

Browse source 
Before: 

![CleanShot 2025-02-25 at 20 11
48@2x](https://github.com/user-attachments/assets/2400270e-64fe-4711-a2aa-31588e73367a)

After:

![CleanShot 2025-02-25 at 20 13
18@2x](https://github.com/user-attachments/assets/70c88d2f-5e16-4f2d-9cc5-666b2f9b8de0)

Release Notes:

- N/A
This commit is contained in:
Nate Butler 2025-02-25 21:07:10 -05:00 • committed by GitHub
parent a5698a430d
commit 30568e6dd1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/git_ui/src/git_panel.rs
View file

@ -34,7 +34,7 @@ use strum::{IntoEnumIterator, VariantNames};
use time::OffsetDateTime; use time::OffsetDateTime;
use ui::{ use ui::{
prelude::*, ButtonLike, Checkbox, ContextMenu, Divider, DividerColor, ElevationIndex, ListItem, prelude::*, ButtonLike, Checkbox, ContextMenu, Divider, DividerColor, ElevationIndex, ListItem,
ListItemSpacing, Scrollbar, ScrollbarState, Tooltip, ListItemSpacing, PopoverMenu, Scrollbar, ScrollbarState, Tooltip,
}; };
use util::{maybe, post_inc, ResultExt, TryFutureExt}; use util::{maybe, post_inc, ResultExt, TryFutureExt};
use workspace::{ use workspace::{
@ -1840,7 +1840,8 @@ impl GitPanel {
cx.dispatch_action(&Diff); cx.dispatch_action(&Diff);
}) })
}), }),
), )
.child(self.render_overflow_menu()),
), ),
) )
} else { } else {
@ -1862,6 +1863,13 @@ impl GitPanel {
}) })
} }
pub fn render_overflow_menu(&self) -> impl IntoElement {
PopoverMenu::new("overflow-menu")
.trigger(IconButton::new("overflow-menu-trigger", IconName::Ellipsis))
.menu(move |window, cx| Some(Self::panel_context_menu(window, cx)))
.anchor(Corner::TopRight)
}
pub fn render_sync_button(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> { pub fn render_sync_button(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
let active_repository = self.project.read(cx).active_repository(cx); let active_repository = self.project.read(cx).active_repository(cx);
active_repository.as_ref().map(|_| { active_repository.as_ref().map(|_| {
@ -2383,21 +2391,26 @@ impl GitPanel {
self.set_context_menu(context_menu, position, window, cx); self.set_context_menu(context_menu, position, window, cx);
} }
fn panel_context_menu(window: &mut Window, cx: &mut App) -> Entity<ContextMenu> {
ContextMenu::build(window, cx, |context_menu, _, _| {
context_menu
.action("Stage All", StageAll.boxed_clone())
.action("Unstage All", UnstageAll.boxed_clone())
.separator()
.action("Open Diff", project_diff::Diff.boxed_clone())
.separator()
.action("Discard Tracked Changes", RestoreTrackedFiles.boxed_clone())
.action("Trash Untracked Files", TrashUntrackedFiles.boxed_clone())
})
}
fn deploy_panel_context_menu( fn deploy_panel_context_menu(
&mut self, &mut self,
position: Point<Pixels>, position: Point<Pixels>,
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| { let context_menu = Self::panel_context_menu(window, cx);
context_menu
.action("Stage All", StageAll.boxed_clone())
.action("Unstage All", UnstageAll.boxed_clone())
.action("Open Diff", project_diff::Diff.boxed_clone())
.separator()
.action("Discard Tracked Changes", RestoreTrackedFiles.boxed_clone())
.action("Trash Untracked Files", TrashUntrackedFiles.boxed_clone())
});
self.set_context_menu(context_menu, position, window, cx); self.set_context_menu(context_menu, position, window, cx);
} }