[Fix] incorrect editor width (#101)

Author: mistricky

core/src/components/command_line/command_line_header.rs

@@ -6,10 +6,7 @@ use crate::{
         render_error,
         style::{ComponentStyle, RawComponentStyle, Size, Style},
     },
-    utils::{
-        code::{calc_wh_with_min_width, CHAR_WIDTH},
-        color::parse_hex_to_cosmic_color,
-    },
+    utils::color::parse_hex_to_cosmic_color,
 };
 
 pub struct CommandLineHeader {
@@ -28,7 +25,11 @@ impl Component for CommandLineHeader {
             "{} {}",
             context.take_snapshot_params.command_output_config.prompt, self.full_command
         );
-        let (w, h) = calc_wh_with_min_width(parsed_line.as_str(), CHAR_WIDTH, 20.);
+        let (w, h) = context
+            .font_renderer
+            .lock()
+            .unwrap()
+            .measure_text(self.metrics, parsed_line.as_str());
 
         Style::default().size(Size::Num(w), Size::Num(h))
     }

core/src/components/command_line/command_line_output.rs

@@ -7,7 +7,6 @@ use crate::{
         render_error,
         style::{self, RawComponentStyle, Size, Style},
     },
-    utils::code::calc_wh_with_min_width,
 };
 
 pub struct CommandLineOutput {
@@ -21,12 +20,12 @@ impl Component for CommandLineOutput {
         &self.children
     }
 
-    fn style(&self, _context: &ComponentContext) -> RawComponentStyle {
-        let (w, h) = calc_wh_with_min_width(
-            &self.ansi_text,
-            self.metrics.font_size / 2.,
-            self.metrics.line_height,
-        );
+    fn style(&self, context: &ComponentContext) -> RawComponentStyle {
+        let (w, h) = context
+            .font_renderer
+            .lock()
+            .unwrap()
+            .measure_text(self.metrics, &self.ansi_text);
 
         Style::default().size(Size::Num(w), Size::Num(h))
     }

core/src/components/editor/code.rs

@@ -11,11 +11,7 @@ use crate::{
         style::{ComponentStyle, RawComponentStyle, Size, Style},
     },
     config::{self},
-    utils::{
-        code::{calc_wh_with_min_width, prepare_code, CHAR_WIDTH},
-        highlight::Highlight,
-        syntax_provider::SyntaxProvider,
-    },
+    utils::{code::prepare_code, highlight::Highlight, syntax_provider::SyntaxProvider},
 };
 
 const FONT_SIZE: f32 = 12.5;
@@ -34,8 +30,12 @@ impl Component for Code {
         &self.children
     }
 
-    fn style(&self, _context: &ComponentContext) -> RawComponentStyle {
-        let (w, h) = calc_wh_with_min_width(&self.value, CHAR_WIDTH, self.metrics.line_height);
+    fn style(&self, context: &ComponentContext) -> RawComponentStyle {
+        let (w, h) = context
+            .font_renderer
+            .lock()
+            .unwrap()
+            .measure_text(self.metrics, &self.value);
 
         Style::default().size(Size::Num(w), Size::Num(h))
     }