zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-02 18:51:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add seperate scrollbar styling

Browse Source
This commit is contained in:
Mikayla Maki 2023-05-22 10:03:02 -07:00
parent 2200a22c07
commit af73c1af06
No known key found for this signature in database
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/editor/src/element.rs
View File

@ -1052,7 +1052,7 @@ impl EditorElement {
..Default::default()
});
let diff_style = theme::current(cx).editor.diff.clone();
let diff_style = &theme::current(cx).editor.scrollbar.git;
for hunk in layout
.position_map
.snapshot

8
crates/theme/src/theme.rs
View File

@ -682,6 +682,14 @@ pub struct Scrollbar {
pub thumb: ContainerStyle,
pub width: f32,
pub min_height_factor: f32,
pub git: GitDiffColors
}
#[derive(Clone, Deserialize, Default)]
pub struct GitDiffColors {
pub inserted: Color,
pub modified: Color,
pub deleted: Color
}
#[derive(Clone, Deserialize, Default)]

2
crates/theme/src/ui.rs
View File

@ -3,7 +3,7 @@ use std::borrow::Cow;
use gpui::{
color::Color,
elements::{
ConstrainedBox, Container, ContainerStyle, Empty, Flex, KeystrokeLabel, Label, LabelStyle,
ConstrainedBox, Container, ContainerStyle, Empty, Flex, KeystrokeLabel, Label,
MouseEventHandler, ParentElement, Stack, Svg,
},
fonts::TextStyle,

11
styles/src/styleTree/editor.ts
View File

@ -247,6 +247,17 @@ export default function editor(colorScheme: ColorScheme) {
color: borderColor(layer, "variant"),
},
},
git: {
deleted: isLight
? colorScheme.ramps.red(0.5).hex()
: colorScheme.ramps.red(0.4).hex(),
modified: isLight
? colorScheme.ramps.yellow(0.3).hex()
: colorScheme.ramps.yellow(0.5).hex(),
inserted: isLight
? colorScheme.ramps.green(0.4).hex()
: colorScheme.ramps.green(0.5).hex(),
}
},
compositionMark: {
underline: {