Fix the git panel's commit button sometimes opening the modal (#28767)
Release Notes: - N/A
This commit is contained in:
parent
cd4a3fd679
commit
144fd0b00d
1 changed files with 18 additions and 4 deletions
|
@ -2999,7 +2999,11 @@ impl GitPanel {
|
||||||
.is_some();
|
.is_some();
|
||||||
|
|
||||||
let footer = v_flex()
|
let footer = v_flex()
|
||||||
.child(PanelRepoFooter::new(display_name, branch, Some(git_panel)))
|
.child(PanelRepoFooter::new(
|
||||||
|
display_name,
|
||||||
|
branch,
|
||||||
|
Some(git_panel.clone()),
|
||||||
|
))
|
||||||
.child(
|
.child(
|
||||||
panel_editor_container(window, cx)
|
panel_editor_container(window, cx)
|
||||||
.id("commit-editor-container")
|
.id("commit-editor-container")
|
||||||
|
@ -3103,9 +3107,19 @@ impl GitPanel {
|
||||||
)
|
)
|
||||||
.mr_0p5(),
|
.mr_0p5(),
|
||||||
)
|
)
|
||||||
.on_click(move |_, window, cx| {
|
.on_click({
|
||||||
window
|
let git_panel = git_panel.downgrade();
|
||||||
.dispatch_action(Box::new(git::Commit), cx);
|
move |_, window, cx| {
|
||||||
|
git_panel
|
||||||
|
.update(cx, |git_panel, cx| {
|
||||||
|
git_panel.commit_changes(
|
||||||
|
CommitOptions { amend: false },
|
||||||
|
window,
|
||||||
|
cx,
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.ok();
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.disabled(!can_commit || self.modal_open)
|
.disabled(!can_commit || self.modal_open)
|
||||||
.tooltip({
|
.tooltip({
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue