WIP: Multiple font size / line height spans (updated)

examples/editor-libcosmic/src/main.rs

@@ -12,7 +12,7 @@ use cosmic::{
     Element,
 };
 use cosmic_text::{
-    Align, Attrs, AttrsList, Buffer, Edit, FontSystem, Metrics, SyntaxEditor, SyntaxSystem, Wrap,
+    Align, Attrs, AttrsList, Buffer, Edit, FontSystem, LineHeight, SyntaxEditor, SyntaxSystem, Wrap,
 };
 use std::{env, fmt, fs, path::PathBuf, sync::Mutex};
 
@@ -46,16 +46,33 @@ impl FontSize {
         ]
     }
 
-    pub fn to_metrics(self) -> Metrics {
+    pub fn to_font_size(self) -> f32 {
         match self {
-            Self::Caption => Metrics::new(10.0, 14.0), // Caption
-            Self::Body => Metrics::new(14.0, 20.0),    // Body
-            Self::Title4 => Metrics::new(20.0, 28.0),  // Title 4
-            Self::Title3 => Metrics::new(24.0, 32.0),  // Title 3
-            Self::Title2 => Metrics::new(28.0, 36.0),  // Title 2
-            Self::Title1 => Metrics::new(32.0, 44.0),  // Title 1
+            Self::Caption => 10.0, // Caption
+            Self::Body => 14.0,    // Body
+            Self::Title4 => 20.0,  // Title 4
+            Self::Title3 => 24.0,  // Title 3
+            Self::Title2 => 28.0,  // Title 2
+            Self::Title1 => 32.0,  // Title 1
         }
     }
+
+    pub fn to_line_height(self) -> LineHeight {
+        match self {
+            Self::Caption => LineHeight::Absolute(14.0), // Caption
+            Self::Body => LineHeight::Absolute(20.0),    // Body
+            Self::Title4 => LineHeight::Absolute(28.0),  // Title 4
+            Self::Title3 => LineHeight::Absolute(32.0),  // Title 3
+            Self::Title2 => LineHeight::Absolute(36.0),  // Title 2
+            Self::Title1 => LineHeight::Absolute(44.0),  // Title 1
+        }
+    }
+
+    pub fn to_attrs(self) -> Attrs<'static> {
+        Attrs::new()
+            .size(self.to_font_size())
+            .line_height(self.to_line_height())
+    }
 }
 
 impl fmt::Display for FontSize {
@@ -131,13 +148,12 @@ impl Application for Window {
     type Theme = Theme;
 
     fn new(_flags: ()) -> (Self, Command<Self::Message>) {
-        let attrs = cosmic_text::Attrs::new().family(cosmic_text::Family::Monospace);
+        let attrs = FontSize::Body
+            .to_attrs()
+            .family(cosmic_text::Family::Monospace);
 
         let mut editor = SyntaxEditor::new(
-            Buffer::new(
-                &mut FONT_SYSTEM.lock().unwrap(),
-                FontSize::Body.to_metrics(),
-            ),
+            Buffer::new(&mut FONT_SYSTEM.lock().unwrap()),
             &SYNTAX_SYSTEM,
             "base16-eighties.dark",
         )
@@ -234,11 +250,13 @@ impl Application for Window {
             }
             Message::FontSizeChanged(font_size) => {
                 self.font_size = font_size;
+                self.attrs = self
+                    .attrs
+                    .size(font_size.to_font_size())
+                    .line_height(font_size.to_line_height());
+
                 let mut editor = self.editor.lock().unwrap();
-                editor
-                    .borrow_with(&mut FONT_SYSTEM.lock().unwrap())
-                    .buffer_mut()
-                    .set_metrics(font_size.to_metrics());
+                update_attrs(&mut *editor, self.attrs);
             }
             Message::WrapChanged(wrap) => {
                 let mut editor = self.editor.lock().unwrap();

examples/editor-libcosmic/src/text_box.rs

@@ -138,15 +138,7 @@ where
             .buffer_mut()
             .shape_until(i32::max_value());
 
-        let mut layout_lines = 0;
-        for line in editor.buffer().lines.iter() {
-            match line.layout_opt() {
-                Some(layout) => layout_lines += layout.len(),
-                None => (),
-            }
-        }
-
-        let height = layout_lines as f32 * editor.buffer().metrics().line_height;
+        let height = editor.buffer().line_heights().iter().sum();
         let size = Size::new(limits.max().width, height);
         log::info!("size {:?}", size);
 
@@ -219,10 +211,10 @@ where
         let mut editor = editor.borrow_with(&mut font_system);
 
         // Scale metrics
-        let metrics = editor.buffer().metrics();
-        editor
-            .buffer_mut()
-            .set_metrics(metrics.scale(SCALE_FACTOR as f32));
+        // let metrics = editor.buffer().metrics();
+        // editor
+        //     .buffer_mut()
+        //     .set_metrics(metrics.scale(SCALE_FACTOR as f32));
 
         // Set size
         editor.buffer_mut().set_size(image_w as f32, image_h as f32);
@@ -246,7 +238,7 @@ where
         );
 
         // Restore original metrics
-        editor.buffer_mut().set_metrics(metrics);
+        // editor.buffer_mut().set_metrics(metrics);
 
         let handle = image::Handle::from_pixels(image_w as u32, image_h as u32, pixels);
         image::Renderer::draw(

examples/rich-text/src/main.rs

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
 use cosmic_text::{
-    Action, Attrs, Buffer, Color, Edit, Editor, Family, FontSystem, Metrics, Shaping, Style,
+    Action, Attrs, Buffer, Color, Edit, Editor, Family, FontSystem, LineHeight, Shaping, Style,
     SwashCache, Weight,
 };
 use orbclient::{EventOption, Renderer, Window, WindowFlag};
@@ -36,17 +36,18 @@ fn main() {
     )
     .unwrap();
 
-    let mut editor = Editor::new(Buffer::new_empty(
-        Metrics::new(32.0, 44.0).scale(display_scale),
-    ));
+    let mut editor = Editor::new(Buffer::new_empty());
 
     let mut editor = editor.borrow_with(&mut font_system);
 
     editor
         .buffer_mut()
         .set_size(window.width() as f32, window.height() as f32);
 
-    let attrs = Attrs::new();
+    let attrs = Attrs::new()
+        .size(32.0)
+        .line_height(LineHeight::Absolute(44.0))
+        .scale(display_scale);
     let serif_attrs = attrs.family(Family::Serif);
     let mono_attrs = attrs.family(Family::Monospace);
     let comic_attrs = attrs.family(Family::Name("Comic Neue"));
@@ -97,13 +98,55 @@ fn main() {
         ("B", attrs.color(Color::rgb(0x00, 0x00, 0xFF))),
         ("O", attrs.color(Color::rgb(0x4B, 0x00, 0x82))),
         ("W ", attrs.color(Color::rgb(0x94, 0x00, 0xD3))),
-        ("Red ", attrs.color(Color::rgb(0xFF, 0x00, 0x00))),
-        ("Orange ", attrs.color(Color::rgb(0xFF, 0x7F, 0x00))),
-        ("Yellow ", attrs.color(Color::rgb(0xFF, 0xFF, 0x00))),
-        ("Green ", attrs.color(Color::rgb(0x00, 0xFF, 0x00))),
-        ("Blue ", attrs.color(Color::rgb(0x00, 0x00, 0xFF))),
-        ("Indigo ", attrs.color(Color::rgb(0x4B, 0x00, 0x82))),
-        ("Violet ", attrs.color(Color::rgb(0x94, 0x00, 0xD3))),
+        (
+            "Red ",
+            attrs
+                .color(Color::rgb(0xFF, 0x00, 0x00))
+                .size(attrs.font_size * 1.9)
+                .line_height(LineHeight::Proportional(0.9)),
+        ),
+        (
+            "Orange ",
+            attrs
+                .color(Color::rgb(0xFF, 0x7F, 0x00))
+                .size(attrs.font_size * 1.6)
+                .line_height(LineHeight::Proportional(1.0)),
+        ),
+        (
+            "Yellow ",
+            attrs
+                .color(Color::rgb(0xFF, 0xFF, 0x00))
+                .size(attrs.font_size * 1.3)
+                .line_height(LineHeight::Proportional(1.1)),
+        ),
+        (
+            "Green ",
+            attrs
+                .color(Color::rgb(0x00, 0xFF, 0x00))
+                .size(attrs.font_size * 1.0)
+                .line_height(LineHeight::Proportional(1.2)),
+        ),
+        (
+            "Blue ",
+            attrs
+                .color(Color::rgb(0x00, 0x00, 0xFF))
+                .size(attrs.font_size * 0.8)
+                .line_height(LineHeight::Proportional(1.3)),
+        ),
+        (
+            "Indigo ",
+            attrs
+                .color(Color::rgb(0x4B, 0x00, 0x82))
+                .size(attrs.font_size * 0.6)
+                .line_height(LineHeight::Proportional(1.4)),
+        ),
+        (
+            "Violet ",
+            attrs
+                .color(Color::rgb(0x94, 0x00, 0xD3))
+                .size(attrs.font_size * 0.4)
+                .line_height(LineHeight::Proportional(1.5)),
+        ),
         ("U", attrs.color(Color::rgb(0x94, 0x00, 0xD3))),
         ("N", attrs.color(Color::rgb(0x4B, 0x00, 0x82))),
         ("I", attrs.color(Color::rgb(0x00, 0x00, 0xFF))),

examples/terminal/src/main.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-use cosmic_text::{Attrs, Buffer, Color, FontSystem, Metrics, Shaping, SwashCache};
+use cosmic_text::{Attrs, Buffer, Color, FontSystem, LineHeight, Shaping, SwashCache};
 use std::cmp::{self, Ordering};
 use termion::{color, cursor};
 
@@ -12,10 +12,10 @@ fn main() {
     let mut swash_cache = SwashCache::new();
 
     // Text metrics indicate the font size and line height of a buffer
-    let metrics = Metrics::new(14.0, 20.0);
+    // let metrics = Metrics::new(14.0, 20.0);
 
     // A Buffer provides shaping and layout for a UTF-8 string, create one per text widget
-    let mut buffer = Buffer::new(&mut font_system, metrics);
+    let mut buffer = Buffer::new(&mut font_system);
 
     let mut buffer = buffer.borrow_with(&mut font_system);
 
@@ -25,7 +25,9 @@ fn main() {
     buffer.set_size(width as f32, height as f32);
 
     // Attributes indicate what font to choose
-    let attrs = Attrs::new();
+    let attrs = Attrs::new()
+        .size(14.0)
+        .line_height(LineHeight::Absolute(20.0));
 
     // Add some text!
     buffer.set_text(" Hi, Rust! 🦀", attrs, Shaping::Advanced);