Update git panel entry checked box tooltip to say Stage/Unstage (#25678)
Before it would always say staged when a user hovered over the check box. Now it will show the correct hover message depending on the state of the entry Release Notes: - N/A
This commit is contained in:
parent
e7df5ce61c
commit
878b50c991
1 changed files with 18 additions and 12 deletions
|
@ -2488,6 +2488,7 @@ impl GitPanel {
|
||||||
|
|
||||||
let id: ElementId = ElementId::Name(format!("entry_{}", display_name).into());
|
let id: ElementId = ElementId::Name(format!("entry_{}", display_name).into());
|
||||||
|
|
||||||
|
let is_entry_staged = self.entry_is_staged(entry);
|
||||||
let mut is_staged: ToggleState = self.entry_is_staged(entry).into();
|
let mut is_staged: ToggleState = self.entry_is_staged(entry).into();
|
||||||
|
|
||||||
if !self.has_staged_changes() && !self.has_conflicts() && !entry.status.is_created() {
|
if !self.has_staged_changes() && !self.has_conflicts() && !entry.status.is_created() {
|
||||||
|
@ -2511,18 +2512,23 @@ impl GitPanel {
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
let start_slot =
|
let start_slot = h_flex()
|
||||||
h_flex()
|
.id(("start-slot", ix))
|
||||||
.id(("start-slot", ix))
|
.gap(DynamicSpacing::Base04.rems(cx))
|
||||||
.gap(DynamicSpacing::Base04.rems(cx))
|
.child(checkbox.tooltip(move |window, cx| {
|
||||||
.child(checkbox.tooltip(|window, cx| {
|
let tooltip_name = if is_entry_staged.unwrap_or(false) {
|
||||||
Tooltip::for_action("Stage File", &ToggleStaged, window, cx)
|
"Unstage"
|
||||||
}))
|
} else {
|
||||||
.child(git_status_icon(status, cx))
|
"Stage"
|
||||||
.on_mouse_down(MouseButton::Left, |_, _, cx| {
|
};
|
||||||
// prevent the list item active state triggering when toggling checkbox
|
|
||||||
cx.stop_propagation();
|
Tooltip::for_action(tooltip_name, &ToggleStaged, window, cx)
|
||||||
});
|
}))
|
||||||
|
.child(git_status_icon(status, cx))
|
||||||
|
.on_mouse_down(MouseButton::Left, |_, _, cx| {
|
||||||
|
// prevent the list item active state triggering when toggling checkbox
|
||||||
|
cx.stop_propagation();
|
||||||
|
});
|
||||||
|
|
||||||
div()
|
div()
|
||||||
.w_full()
|
.w_full()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue