zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-07 11:28:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up style properties on hunk controls (#18639)

Browse Source 
This PR removes some duplicate style properties on the hunk controls,
namely padding, border, and background color.

Release Notes:

- N/A
This commit is contained in:
Danilo Leal 2024-10-03 16:23:56 +02:00 committed by GitHub
parent 1e8297a469
commit dc85378b96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/editor/src/hunk_diff.rs
View File

@ -379,6 +379,7 @@ impl Editor {
});
let border_color = cx.theme().colors().border_variant;
let bg_color = cx.theme().colors().editor_background;
let gutter_color = match hunk.status {
DiffHunkStatus::Added => cx.theme().status().created,
DiffHunkStatus::Modified => cx.theme().status().modified,
@ -394,6 +395,7 @@ impl Editor {
render: Box::new({
let editor = cx.view().clone();
let hunk = hunk.clone();
move |cx| {
let hunk_controls_menu_handle =
editor.read(cx).hunk_controls_menu_handle.clone();
@ -404,7 +406,7 @@ impl Editor {
.w_full()
.border_t_1()
.border_color(border_color)
.bg(cx.theme().colors().editor_background)
.bg(bg_color)
.child(
div()
.id("gutter-strip")
@ -424,14 +426,9 @@ impl Editor {
)
.child(
h_flex()
.pl_2()
.pr_6()
.px_6()
.size_full()
.justify_between()
.border_t_1()
.pl_6()
.pr_6()
.border_color(border_color)
.child(
h_flex()
.gap_1()
@ -608,7 +605,7 @@ impl Editor {
move |menu, _| {
menu.context(focus.clone())
.action(
"Discard All",
"Discard All Hunks",
RevertFile
.boxed_clone(),
)