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

Move git hunk controls to the left side (#18460)

Browse source 
![Screenshot 2024-09-27 at 1 05
14 PM](https://github.com/user-attachments/assets/260a7d05-daa8-4a22-92bc-3b956035227f)

Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2024-09-27 13:13:55 -07:00 • committed by GitHub
parent 1c5be9de4e
commit 689da9d0b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 64 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

131
crates/editor/src/hunk_diff.rs
View file

@ -513,49 +513,7 @@ impl Editor {
}); });
} }
}), }),
), )
)
.child(
h_flex()
.gap_2()
.pr_6()
.child({
let focus = editor.focus_handle(cx);
PopoverMenu::new("hunk-controls-dropdown")
.trigger(
IconButton::new(
"toggle_editor_selections_icon",
IconName::EllipsisVertical,
)
.shape(IconButtonShape::Square)
.icon_size(IconSize::Small)
.style(ButtonStyle::Subtle)
.selected(
hunk_controls_menu_handle.is_deployed(),
)
.when(
!hunk_controls_menu_handle.is_deployed(),
|this| {
this.tooltip(|cx| {
Tooltip::text("Hunk Controls", cx)
})
},
),
)
.anchor(AnchorCorner::TopRight)
.with_handle(hunk_controls_menu_handle)
.menu(move |cx| {
let focus = focus.clone();
let menu =
ContextMenu::build(cx, move |menu, _| {
menu.context(focus.clone()).action(
"Discard All",
RevertFile.boxed_clone(),
)
});
Some(menu)
})
})
.child( .child(
IconButton::new("discard", IconName::RotateCcw) IconButton::new("discard", IconName::RotateCcw)
.shape(IconButtonShape::Square) .shape(IconButtonShape::Square)
@ -601,31 +559,70 @@ impl Editor {
} }
}), }),
) )
.child( .child({
IconButton::new("collapse", IconName::Close) let focus = editor.focus_handle(cx);
.shape(IconButtonShape::Square) PopoverMenu::new("hunk-controls-dropdown")
.icon_size(IconSize::Small) .trigger(
.tooltip({ IconButton::new(
let focus_handle = editor.focus_handle(cx); "toggle_editor_selections_icon",
move |cx| { IconName::EllipsisVertical,
Tooltip::for_action_in( )
"Collapse Hunk", .shape(IconButtonShape::Square)
&ToggleHunkDiff, .icon_size(IconSize::Small)
&focus_handle, .style(ButtonStyle::Subtle)
cx, .selected(
) hunk_controls_menu_handle.is_deployed(),
} )
}) .when(
.on_click({ !hunk_controls_menu_handle.is_deployed(),
let editor = editor.clone(); |this| {
let hunk = hunk.clone(); this.tooltip(|cx| {
move |_event, cx| { Tooltip::text("Hunk Controls", cx)
editor.update(cx, |editor, cx| { })
editor.toggle_hovered_hunk(&hunk, cx); },
),
)
.anchor(AnchorCorner::TopRight)
.with_handle(hunk_controls_menu_handle)
.menu(move |cx| {
let focus = focus.clone();
let menu =
ContextMenu::build(cx, move |menu, _| {
menu.context(focus.clone()).action(
"Discard All",
RevertFile.boxed_clone(),
)
}); });
} Some(menu)
}), })
), }),
)
.child(
h_flex().gap_2().pr_6().child(
IconButton::new("collapse", IconName::Close)
.shape(IconButtonShape::Square)
.icon_size(IconSize::Small)
.tooltip({
let focus_handle = editor.focus_handle(cx);
move |cx| {
Tooltip::for_action_in(
"Collapse Hunk",
&ToggleHunkDiff,
&focus_handle,
cx,
)
}
})
.on_click({
let editor = editor.clone();
let hunk = hunk.clone();
move |_event, cx| {
editor.update(cx, |editor, cx| {
editor.toggle_hovered_hunk(&hunk, cx);
});
}
}),
),
), ),
) )
.into_any_element() .into_any_element()