From 8f1243ceef3ad7438e33d686b89a4d31f902df79 Mon Sep 17 00:00:00 2001 From: Dongdong Zhou Date: Wed, 28 Sep 2022 22:04:20 +0100 Subject: [PATCH] hover style change --- lapce-data/src/hover.rs | 1 + lapce-ui/src/hover.rs | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lapce-data/src/hover.rs b/lapce-data/src/hover.rs index 23e2b34b..9f87f0a8 100644 --- a/lapce-data/src/hover.rs +++ b/lapce-data/src/hover.rs @@ -172,6 +172,7 @@ fn collect_diagnostics( // Build up the text for all the diagnostics let mut content = RichTextBuilder::new(); + content.set_line_height(1.5); for diagnostic in diagnostics { content.push(&diagnostic.message); diff --git a/lapce-ui/src/hover.rs b/lapce-ui/src/hover.rs index e10f1184..806a6995 100644 --- a/lapce-ui/src/hover.rs +++ b/lapce-ui/src/hover.rs @@ -328,8 +328,7 @@ fn layout( let diagnostic_text_metrics = self.active_diagnostic_layout.layout_metrics(); - diagnostic_text_metrics.size.height - + data.config.editor.line_height() as f64 * 1.5 + diagnostic_text_metrics.size.height + Hover::STARTING_Y * 3.0 }; Size::new( @@ -348,7 +347,7 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, env: &Env) { let line_height = data.config.editor.line_height() as f64; let rect = ctx.region().bounding_box(); - let mut diagnostic_origin = Point::new(Self::STARTING_X, Self::STARTING_Y); + let diagnostic_origin = Point::new(Self::STARTING_X, Self::STARTING_Y); ctx.fill( rect, @@ -360,14 +359,13 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, env: &Env) { let height = if self.active_diagnostic_layout.size().is_empty() { 0.0 } else { - diagnostic_origin.y += line_height * 0.5; - let diagnostic_text_metrics = self.active_diagnostic_layout.layout_metrics(); let line = { let x0 = rect.x0 + side_margin; - let y = diagnostic_text_metrics.size.height + line_height * 1.5; + let y = + diagnostic_text_metrics.size.height + Hover::STARTING_Y * 3.0; let x1 = rect.x1 - side_margin; Line::new(Point::new(x0, y), Point::new(x1, y)) }; @@ -380,7 +378,7 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, env: &Env) { self.active_diagnostic_layout.draw(ctx, diagnostic_origin); - diagnostic_text_metrics.size.height + line_height + diagnostic_text_metrics.size.height + Hover::STARTING_Y * 3.0 }; let doc_origin = diagnostic_origin + (0.0, height);