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

git: Fix cmd-enter (#25628)

Browse source 
Closes #ISSUE

Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2025-02-25 23:07:55 -07:00 • committed by GitHub
parent 08539b32d0
commit 7f214ed25a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/git_ui/src/project_diff.rs
View file

@ -627,6 +627,7 @@ impl Render for ProjectDiff {
div()
.track_focus(&self.focus_handle)
.key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
.bg(cx.theme().colors().editor_background)
.flex()
.items_center()
@ -873,11 +874,17 @@ impl Render for ProjectDiffToolbar {
.when(
button_states.unstage_all && !button_states.stage_all,
|el| {
el.child(Button::new("unstage-all", "Unstage All").on_click(
cx.listener(|this, _, window, cx| {
this.dispatch_panel_action(&UnstageAll, window, cx)
}),
))
el.child(
Button::new("unstage-all", "Unstage All")
.tooltip(Tooltip::for_action_title_in(
"Unstage all changes",
&UnstageAll,
&focus_handle,
))
.on_click(cx.listener(|this, _, window, cx| {
this.dispatch_panel_action(&UnstageAll, window, cx)
})),
)
},
)
.when(
@ -889,6 +896,11 @@ impl Render for ProjectDiffToolbar {
div().child(
Button::new("stage-all", "Stage All")
.disabled(!button_states.stage_all)
.tooltip(Tooltip::for_action_title_in(
"Stage all changes",
&StageAll,
&focus_handle,
))
.on_click(cx.listener(|this, _, window, cx| {
this.dispatch_panel_action(&StageAll, window, cx)
})),
@ -899,8 +911,12 @@ impl Render for ProjectDiffToolbar {
.child(
Button::new("commit", "Commit")
.disabled(!button_states.commit)
.tooltip(Tooltip::for_action_title_in(
"Commit",
&Commit,
&focus_handle,
))
.on_click(cx.listener(|this, _, window, cx| {
// todo this should open modal, not focus panel.
this.dispatch_action(&Commit, window, cx);
})),
),