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

git: Fix project diff shortcuts (#26045)

Browse source 
Release Notes:

- git: Fix keyboard shortcut display in project diff view
This commit is contained in:
Conrad Irwin 2025-03-04 10:32:20 -07:00 • committed by GitHub
parent ad94642e83
commit 85211889e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 108 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -812,10 +812,8 @@ impl Render for ProjectDiffToolbar {
el.child(
Button::new("stage", "Stage")
.tooltip(Tooltip::for_action_title_in(
"Stage",
&StageAndNext {
whole_excerpt: false,
},
"Stage and go to next hunk",
&StageAndNext,
&focus_handle,
))
// don't actually disable the button so it's mashable
@ -825,22 +823,14 @@ impl Render for ProjectDiffToolbar {
Color::Disabled
})
.on_click(cx.listener(|this, _, window, cx| {
this.dispatch_action(
&StageAndNext {
whole_excerpt: false,
},
window,
cx,
)
this.dispatch_action(&StageAndNext, window, cx)
})),
)
.child(
Button::new("unstage", "Unstage")
.tooltip(Tooltip::for_action_title_in(
"Unstage",
&UnstageAndNext {
whole_excerpt: false,
},
"Unstage and go to next hunk",
&UnstageAndNext,
&focus_handle,
))
.color(if button_states.unstage {
@ -849,13 +839,7 @@ impl Render for ProjectDiffToolbar {
Color::Disabled
})
.on_click(cx.listener(|this, _, window, cx| {
this.dispatch_action(
&UnstageAndNext {
whole_excerpt: false,
},
window,
cx,
)
this.dispatch_action(&UnstageAndNext, window, cx)
})),
)
}),
@ -869,20 +853,12 @@ impl Render for ProjectDiffToolbar {
.shape(ui::IconButtonShape::Square)
.tooltip(Tooltip::for_action_title_in(
"Go to previous hunk",
&GoToPreviousHunk {
center_cursor: false,
},
&GoToPreviousHunk,
&focus_handle,
))
.disabled(!button_states.prev_next)
.on_click(cx.listener(|this, _, window, cx| {
this.dispatch_action(
&GoToPreviousHunk {
center_cursor: true,
},
window,
cx,
)
this.dispatch_action(&GoToPreviousHunk, window, cx)
})),
)
.child(
@ -890,20 +866,12 @@ impl Render for ProjectDiffToolbar {
.shape(ui::IconButtonShape::Square)
.tooltip(Tooltip::for_action_title_in(
"Go to next hunk",
&GoToHunk {
center_cursor: false,
},
&GoToHunk,
&focus_handle,
))
.disabled(!button_states.prev_next)
.on_click(cx.listener(|this, _, window, cx| {
this.dispatch_action(
&GoToHunk {
center_cursor: true,
},
window,
cx,
)
this.dispatch_action(&GoToHunk, window, cx)
})),
),
)