hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix underline rendering

Browse Source
This commit is contained in:
daa
2017-09-12 15:09:17 +03:00
parent 61fdb83427
commit 39db875b6f
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/render/context.rs
View File

@@ -43,11 +43,6 @@ impl Context {
&self.state.font_desc
}
#[inline]
pub fn ascent(&self) -> f64 {
self.state.cell_metrics.ascent
}
#[inline]
pub fn cell_metrics(&self) -> &CellMetrics {
&self.state.cell_metrics

19
src/render/mod.rs
View File

@@ -33,10 +33,10 @@ pub fn render(
char_width,
underline_position,
underline_thickness,
ascent,
..
} = font_ctx.cell_metrics();
let mut line_y = 0.0;
let ascent = font_ctx.ascent();
let (cursor_row, cursor_col) = ui_model.get_cursor();
for (row, line) in ui_model.model().iter().enumerate() {
@@ -78,21 +78,20 @@ pub fn render(
if cell.attrs.underline || cell.attrs.undercurl {
if cell.attrs.undercurl {
// TODO: properly draw undercurl
//FIXME: don't repaint all lines on changes
let sp = color_model.actual_cell_sp(cell);
ctx.set_source_rgba(sp.0, sp.1, sp.2, 0.7);
let max_undercurl_height = (line_height - underline_position) * 2.0;
let undercurl_height = (underline_thickness * 4.0).min(max_undercurl_height);
let undercurl_y = line_y + underline_position - undercurl_height / 2.0;
ctx.show_error_underline(
line_x,
line_y + underline_position,
undercurl_y,
char_width,
underline_thickness * 5.0,
undercurl_height
);
//ctx.set_dash(&[4.0, 2.0], 0.0);
//ctx.set_line_width(underline_thickness);
//ctx.move_to(line_x, line_y + underline_position);
//ctx.line_to(line_x + char_width, line_y + underline_position);
//ctx.stroke();
//ctx.set_dash(&[], 0.0);
} else if cell.attrs.underline {
ctx.set_source_rgb(fg.0, fg.1, fg.2);
ctx.set_line_width(underline_thickness);