From cdf3d5d009f7db72587016b64c398e24749318a8 Mon Sep 17 00:00:00 2001 From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com> Date: Wed, 8 Jun 2022 08:51:50 +0800 Subject: [PATCH 1/5] feat: add `plugin load failed` message --- lapce-ui/src/plugin.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lapce-ui/src/plugin.rs b/lapce-ui/src/plugin.rs index 30588e26..396782a7 100644 --- a/lapce-ui/src/plugin.rs +++ b/lapce-ui/src/plugin.rs @@ -158,6 +158,24 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) { let viewport = ctx.size().to_rect().inflate(-padding, 0.0); ctx.clip(viewport); + if data.plugins.is_empty() { + let y = self.line_height; + let x = self.line_height; + let layout = ctx + .text() + .new_text_layout("Failed to load plugin information") + .font( + data.config.ui.font_family(), + data.config.ui.font_size() as f64, + ) + .default_attribute(TextAttribute::Weight(FontWeight::BOLD)) + .text_color(Color::from_hex_str("#ffb900").unwrap()) + .build() + .unwrap(); + ctx.draw_text(&layout, Point::new(x, y)); + return; + } + for (i, plugin) in data.plugins.iter().enumerate() { let y = 3.0 * self.line_height * i as f64; let x = 3.0 * self.line_height; From 5b9144f0a3a3820eb36e1691e3e5cbf1ae82e885 Mon Sep 17 00:00:00 2001 From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com> Date: Wed, 8 Jun 2022 08:56:50 +0800 Subject: [PATCH 2/5] feat: add `plugin load failed` message --- lapce-ui/src/plugin.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lapce-ui/src/plugin.rs b/lapce-ui/src/plugin.rs index 396782a7..79a356bc 100644 --- a/lapce-ui/src/plugin.rs +++ b/lapce-ui/src/plugin.rs @@ -168,8 +168,8 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) { data.config.ui.font_family(), data.config.ui.font_size() as f64, ) - .default_attribute(TextAttribute::Weight(FontWeight::BOLD)) - .text_color(Color::from_hex_str("#ffb900").unwrap()) + .default_attribute(TextAttribute::Weight(FontWeight::SEMI_BOLD)) + .text_color(Color::from_hex_str("#d29200").unwrap()) .build() .unwrap(); ctx.draw_text(&layout, Point::new(x, y)); From 60ceda75441486cbdecbc3e2c04e1b3699baa75e Mon Sep 17 00:00:00 2001 From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com> Date: Wed, 8 Jun 2022 10:25:27 +0800 Subject: [PATCH 3/5] feat: change `lapce warn` color --- lapce-ui/src/plugin.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lapce-ui/src/plugin.rs b/lapce-ui/src/plugin.rs index 79a356bc..901aee94 100644 --- a/lapce-ui/src/plugin.rs +++ b/lapce-ui/src/plugin.rs @@ -169,7 +169,7 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) { data.config.ui.font_size() as f64, ) .default_attribute(TextAttribute::Weight(FontWeight::SEMI_BOLD)) - .text_color(Color::from_hex_str("#d29200").unwrap()) + .text_color(data.config.get_color_unchecked(LapceTheme::LAPCE_WARN)) .build() .unwrap(); ctx.draw_text(&layout, Point::new(x, y)); From 297710dee5eff3c1a3d2c4cbeea6bad29f84f399 Mon Sep 17 00:00:00 2001 From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com> Date: Wed, 8 Jun 2022 10:25:54 +0800 Subject: [PATCH 4/5] feat: change `lapce warn` color --- lapce-ui/src/plugin.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lapce-ui/src/plugin.rs b/lapce-ui/src/plugin.rs index 901aee94..a2de0870 100644 --- a/lapce-ui/src/plugin.rs +++ b/lapce-ui/src/plugin.rs @@ -169,7 +169,7 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) { data.config.ui.font_size() as f64, ) .default_attribute(TextAttribute::Weight(FontWeight::SEMI_BOLD)) - .text_color(data.config.get_color_unchecked(LapceTheme::LAPCE_WARN)) + .text_color(data.config.get_color_unchecked(LapceTheme::LAPCE_WARN).clone()) .build() .unwrap(); ctx.draw_text(&layout, Point::new(x, y)); From 43333e812d891aed5ed97ca6675c3782924715b9 Mon Sep 17 00:00:00 2001 From: YuKun Liu <41265098+mrxiaozhuox@users.noreply.github.com> Date: Wed, 8 Jun 2022 17:45:06 +0800 Subject: [PATCH 5/5] fix: format code --- lapce-ui/src/plugin.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lapce-ui/src/plugin.rs b/lapce-ui/src/plugin.rs index a2de0870..f8f647ce 100644 --- a/lapce-ui/src/plugin.rs +++ b/lapce-ui/src/plugin.rs @@ -169,7 +169,11 @@ fn paint(&mut self, ctx: &mut PaintCtx, data: &LapceTabData, _env: &Env) { data.config.ui.font_size() as f64, ) .default_attribute(TextAttribute::Weight(FontWeight::SEMI_BOLD)) - .text_color(data.config.get_color_unchecked(LapceTheme::LAPCE_WARN).clone()) + .text_color( + data.config + .get_color_unchecked(LapceTheme::LAPCE_WARN) + .clone(), + ) .build() .unwrap(); ctx.draw_text(&layout, Point::new(x, y));