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

Halve opacity on wrap guides (#2815)

Browse source 
Wrap guides are a little too bright as is
This commit is contained in:
Mikayla Maki 2023-07-31 10:59:34 -07:00 • committed by GitHub
commit ef57d444d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -554,7 +554,9 @@ impl EditorElement {
(text_bounds.origin_x() + wrap_position + layout.position_map.em_width / 2.) (text_bounds.origin_x() + wrap_position + layout.position_map.em_width / 2.)
- scroll_left; - scroll_left;
if x < text_bounds.origin_x() { if x < text_bounds.origin_x()
|| (layout.show_scrollbars && x > self.scrollbar_left(&bounds))
{
continue; continue;
} }
@ -1046,6 +1048,10 @@ impl EditorElement {
scene.pop_layer(); scene.pop_layer();
} }
fn scrollbar_left(&self, bounds: &RectF) -> f32 {
bounds.max_x() - self.style.theme.scrollbar.width
}
fn paint_scrollbar( fn paint_scrollbar(
&mut self, &mut self,
scene: &mut SceneBuilder, scene: &mut SceneBuilder,
@ -1064,7 +1070,7 @@ impl EditorElement {
let top = bounds.min_y(); let top = bounds.min_y();
let bottom = bounds.max_y(); let bottom = bounds.max_y();
let right = bounds.max_x(); let right = bounds.max_x();
let left = right - style.width; let left = self.scrollbar_left(&bounds);
let row_range = &layout.scrollbar_row_range; let row_range = &layout.scrollbar_row_range;
let max_row = layout.max_row as f32 + (row_range.end - row_range.start); let max_row = layout.max_row as f32 + (row_range.end - row_range.start);

4
styles/src/style_tree/editor.ts
View file

@ -182,8 +182,8 @@ export default function editor(): any {
line_number: with_opacity(foreground(layer), 0.35), line_number: with_opacity(foreground(layer), 0.35),
line_number_active: foreground(layer), line_number_active: foreground(layer),
rename_fade: 0.6, rename_fade: 0.6,
wrap_guide: with_opacity(foreground(layer), 0.1), wrap_guide: with_opacity(foreground(layer), 0.05),
active_wrap_guide: with_opacity(foreground(layer), 0.2), active_wrap_guide: with_opacity(foreground(layer), 0.1),
unnecessary_code_fade: 0.5, unnecessary_code_fade: 0.5,
selection: theme.players[0], selection: theme.players[0],
whitespace: theme.ramps.neutral(0.5).hex(), whitespace: theme.ramps.neutral(0.5).hex(),