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

WIP Git gutter styling

Browse source
This commit is contained in:
Nate Butler 2022-09-21 10:39:03 -04:00 • committed by Julia
parent 113d3b88d0
commit 8a2430090b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/editor/src/element.rs
View file

@ -567,7 +567,7 @@ impl EditorElement {
let start_y = row as f32 * line_height + offset - scroll_top; let start_y = row as f32 * line_height + offset - scroll_top;
let end_y = start_y + line_height; let end_y = start_y + line_height;
let width = 0.4 * line_height; let width = 0.275 * line_height;
let highlight_origin = bounds.origin() + vec2f(-width, start_y); let highlight_origin = bounds.origin() + vec2f(-width, start_y);
let highlight_size = vec2f(width * 2., end_y - start_y); let highlight_size = vec2f(width * 2., end_y - start_y);
let highlight_bounds = RectF::new(highlight_origin, highlight_size); let highlight_bounds = RectF::new(highlight_origin, highlight_size);
@ -589,7 +589,7 @@ impl EditorElement {
let start_y = start_row as f32 * line_height - scroll_top; let start_y = start_row as f32 * line_height - scroll_top;
let end_y = end_row as f32 * line_height - scroll_top; let end_y = end_row as f32 * line_height - scroll_top;
let width = 0.22 * line_height; let width = 0.12 * line_height;
let highlight_origin = bounds.origin() + vec2f(-width, start_y); let highlight_origin = bounds.origin() + vec2f(-width, start_y);
let highlight_size = vec2f(width * 2., end_y - start_y); let highlight_size = vec2f(width * 2., end_y - start_y);
let highlight_bounds = RectF::new(highlight_origin, highlight_size); let highlight_bounds = RectF::new(highlight_origin, highlight_size);
@ -598,7 +598,7 @@ impl EditorElement {
bounds: highlight_bounds, bounds: highlight_bounds,
background: Some(color), background: Some(color),
border: Border::new(0., Color::transparent_black()), border: Border::new(0., Color::transparent_black()),
corner_radius: 0.2 * line_height, corner_radius: 0.05 * line_height,
}); });
} }

6
styles/src/styleTree/editor.ts
View file

@ -60,9 +60,9 @@ export default function editor(theme: Theme) {
indicator: iconColor(theme, "secondary"), indicator: iconColor(theme, "secondary"),
verticalScale: 0.618 verticalScale: 0.618
}, },
diffBackgroundDeleted: theme.ramps.red(0.3).hex(), diffBackgroundDeleted: theme.iconColor.error,
diffBackgroundInserted: theme.ramps.green(0.3).hex(), diffBackgroundInserted: theme.iconColor.ok,
diffBackgroundModified: theme.ramps.blue(0.3).hex(), diffBackgroundModified: theme.iconColor.warning,
documentHighlightReadBackground: theme.editor.highlight.occurrence, documentHighlightReadBackground: theme.editor.highlight.occurrence,
documentHighlightWriteBackground: theme.editor.highlight.activeOccurrence, documentHighlightWriteBackground: theme.editor.highlight.activeOccurrence,
errorColor: theme.textColor.error, errorColor: theme.textColor.error,