scale other fonts whenever is necessary

sugarloaf/examples/text.rs

@@ -133,7 +133,7 @@ impl ApplicationHandler for Application {
                 );
                 content.finish_line();
                 content.add_text(
-                    "㏑¼",
+                    "│㏑¼",
                     FragmentStyle {
                         color: [0.0, 0.0, 0.0, 1.0],
                         background_color: Some([1.0, 1.0, 1.0, 1.0]),
@@ -152,7 +152,7 @@ impl ApplicationHandler for Application {
                 );
                 content.finish_line();
                 content.add_text(
-                    " regular -> ",
+                    "│regular -> ",
                     FragmentStyle {
                         decoration: Some(FragmentStyleDecoration::Underline(
                             UnderlineInfo {
@@ -202,7 +202,7 @@ impl ApplicationHandler for Application {
                     },
                 );
                 content.add_text(
-                    "curly",
+                    "│curly",
                     FragmentStyle {
                         decoration: Some(FragmentStyleDecoration::Underline(
                             UnderlineInfo {
@@ -219,7 +219,7 @@ impl ApplicationHandler for Application {
                 );
                 content.finish_line();
                 content.add_text(
-                    "dashed",
+                    "│dashed",
                     FragmentStyle {
                         decoration: Some(FragmentStyleDecoration::Underline(
                             UnderlineInfo {
@@ -259,6 +259,15 @@ impl ApplicationHandler for Application {
                         ..FragmentStyle::default()
                     },
                 );
+                content.finish_line();
+                content.add_text(
+                    "│ \u{E0B6}Hello There!\u{e0b4}",
+                    FragmentStyle {
+                        color: [1.0, 1.0, 1.0, 1.0],
+                        background_color: Some([0.5, 0.5, 1.0, 1.0]),
+                        ..FragmentStyle::default()
+                    },
+                );
                 sugarloaf.set_content(content.build());
                 sugarloaf.render();
                 event_loop.set_control_flow(ControlFlow::Wait);

sugarloaf/src/components/rich_text/image_cache/glyph.rs

@@ -21,6 +21,7 @@ pub struct GlyphCache {
     scx: ScaleContext,
     fonts: FxHashMap<FontKey, FontEntry>,
     img: GlyphImage,
+    max_height: u16,
 }
 
 impl GlyphCache {
@@ -29,6 +30,7 @@ impl GlyphCache {
             scx: ScaleContext::new(),
             fonts: FxHashMap::default(),
             img: GlyphImage::new(),
+            max_height: 0,
         }
     }
 
@@ -55,11 +57,17 @@ impl GlyphCache {
             entry,
             images,
             scaler,
+            max_height: &self.max_height,
             scaled_image: &mut self.img,
             quant_size,
         }
     }
 
+    #[inline]
+    pub fn set_max_height(&mut self, max_height: u16) {
+        self.max_height = max_height;
+    }
+
     // pub fn prune(&mut self, images: &mut ImageCache) {
     //     self.fonts.retain(|_, entry| {
     //         for glyph in &entry.glyphs {
@@ -68,14 +76,6 @@ impl GlyphCache {
     //         false
     //     });
     // }
-
-    #[allow(unused)]
-    pub fn clear_evicted(&mut self, images: &mut ImageCache) {
-        self.fonts.retain(|_, entry| {
-            entry.glyphs.retain(|_, g| images.is_valid(g.image));
-            !entry.glyphs.is_empty()
-        });
-    }
 }
 
 fn get_entry<'a>(
@@ -103,6 +103,7 @@ pub struct GlyphCacheSession<'a> {
     scaler: Scaler<'a>,
     scaled_image: &'a mut GlyphImage,
     quant_size: u16,
+    max_height: &'a u16,
 }
 
 impl<'a> GlyphCacheSession<'a> {
@@ -149,11 +150,33 @@ impl<'a> GlyphCacheSession<'a> {
                 data: ImageData::Borrowed(&self.scaled_image.data),
             };
             let image = self.images.allocate(req)?;
+
+            let mut top = p.top;
+            let mut height = h;
+
+            // If dimension is None it means that we are running
+            // for the first time and in this case, we will obtain
+            // what the next glyph entries should respect in terms of
+            // top and height values
+            //
+            // e.g: Placement { left: 11, top: 42, width: 8, height: 50 }
+            //
+            // The calculation is made based on max_height
+            // If the rect max height is 50 and the glyph height is 68
+            // and 48 top, then (68 - 50 = 18) height as difference and
+            // apply it to the top (bigger the top == up ^).
+            if self.max_height > &0 && &h > self.max_height {
+                let difference = h - self.max_height;
+
+                top -= difference as i32;
+                height = *self.max_height;
+            }
+
             let entry = GlyphEntry {
                 left: p.left,
-                top: p.top,
+                top,
                 width: w,
-                height: h,
+                height,
                 image,
                 is_bitmap: self.scaled_image.content == Content::Color,
             };

sugarloaf/src/components/rich_text/mod.rs

@@ -472,6 +472,8 @@ fn draw_layout(
         }
     }
 
+    glyphs_cache.set_max_height(rect.height as u16);
+
     let mut session = glyphs_cache.session(
         image_cache,
         font_library[current_font].as_ref(),
@@ -503,7 +505,6 @@ fn draw_layout(
             let char_width = run.char_width();
             let mut cached_run = CachedRun::new(char_width);
             let font = *run.font();
-            let char_width = run.char_width();
 
             let run_x = px;
             glyphs.clear();

sugarloaf/src/layout/layout_data.rs

@@ -430,12 +430,12 @@ fn commit_line(
         hash: run_data.hash,
         ascent: run_data.ascent.round(),
         descent: run_data.descent.round(),
-        leading: (run_data.leading * 0.5).round() * 2.,
+        leading: (run_data.leading).round() * 2.,
         ..Default::default()
     };
 
-    let above = (line.ascent + line.leading * 0.5).round();
-    let below = (line.descent + line.leading * 0.5).round();
+    let above = line.ascent;
+    let below = line.descent;
     line.baseline = *y + above;
     *y = line.baseline + below;
 

sugarloaf/src/sugarloaf/compositors/advanced.rs

@@ -62,7 +62,6 @@ impl Advanced {
 
     #[inline]
     pub fn update_layout(&mut self, tree: &SugarTree) {
-        // let start = std::time::Instant::now();
         self.render_data = RenderData::default();
 
         let mut lb = self
@@ -74,19 +73,11 @@ impl Advanced {
         self.render_data
             .break_lines()
             .break_without_advance_or_alignment();
-
-        // let duration = start.elapsed();
-        // println!(" - advanced::update_layout() is: {:?}", duration);
     }
 
     #[inline]
     pub fn calculate_dimensions(&mut self, tree: &SugarTree) {
         let mut content_builder = Content::builder();
-        // content_builder.enter_span(&[
-        //     SpanStyle::FontId(0),
-        //     SpanStyle::Size(tree.layout.font_size),
-        //     // S::features(&[("dlig", 1).into(), ("hlig", 1).into()][..]),
-        // ]);
         content_builder.add_char(' ', FragmentStyle::default());
 
         let mut lb = self