fix: font outline non-rendering bug

Author: LiteHell

game/src/game/util/create_outlined_font_texture.rs

@@ -1,6 +1,5 @@
 use std::u8;
 
-
 use sdl2::{
     pixels::{Color, PixelFormatEnum},
     render::{Texture, TextureCreator, TextureValueError},
@@ -43,32 +42,29 @@ pub fn create_font_texture<'a, T>(
     let font = cairo::FontFace::create_from_ft(ft_font)
         .expect("Failed to create cairo font from freetype face");
     let text_extent = get_text_extent(&font, font_size as f64, text);
+    let (surface_width, surface_height) = (
+        text_extent.width() as i32 + (outline_size as i32) * 2,
+        text_extent.height() as i32 + (outline_size as i32) * 2,
+    );
     let cairo_surface = {
-        cairo::ImageSurface::create(
-            cairo::Format::ARgb32,
-            text_extent.width() as i32,
-            text_extent.height() as i32,
-        )
-        .expect("Couldn't create a surface")
+        cairo::ImageSurface::create(cairo::Format::ARgb32, surface_width, surface_height)
+            .expect("Couldn't create a surface")
     };
 
     // Create cairo context
     let cairo_context =
         cairo::Context::new(&cairo_surface).expect("Failed to create cairo context");
 
-    // Draw string
+    // Set text path
     cairo_context.set_font_size(font_size as f64);
     cairo_context.set_font_face(&font);
-    cairo_context.move_to(-text_extent.x_bearing(), -text_extent.y_bearing());
-    cairo_context.text_path(&text);
-    cairo_context.set_source_rgba(
-        (font_color.r as f64) / u8::MAX as f64,
-        (font_color.g as f64) / u8::MAX as f64,
-        (font_color.b as f64) / u8::MAX as f64,
-        (font_color.a as f64) / u8::MAX as f64,
+    cairo_context.move_to(
+        -text_extent.x_bearing() + outline_size as f64,
+        -text_extent.y_bearing() + outline_size as f64,
     );
-    cairo_context.fill().expect("Failed to render font");
+    cairo_context.text_path(&text);
 
+    // Draw outline
     if outline_size != 0 {
         let outline_color = outline_color.expect("Outline color should be given");
         cairo_context.set_source_rgba(
@@ -78,14 +74,25 @@ pub fn create_font_texture<'a, T>(
             (outline_color.a as f64) / u8::MAX as f64,
         );
         cairo_context.set_line_width(outline_size as f64);
-        cairo_context.stroke().expect("Failed to draw font-stroke");
+        cairo_context
+            .stroke_preserve()
+            .expect("Failed to draw font-stroke");
         cairo_context.set_line_width(0.0);
     }
 
+    // Fill inside
+    cairo_context.set_source_rgba(
+        (font_color.r as f64) / u8::MAX as f64,
+        (font_color.g as f64) / u8::MAX as f64,
+        (font_color.b as f64) / u8::MAX as f64,
+        (font_color.a as f64) / u8::MAX as f64,
+    );
+    cairo_context.fill().expect("Failed to render font");
+
     // Create surface\
     let mut surface: sdl2::surface::Surface = sdl2::surface::Surface::new(
-        text_extent.width() as u32,
-        text_extent.height() as u32,
+        surface_width as u32,
+        surface_height as u32,
         PixelFormatEnum::ARGB8888,
     )
     .expect("Failed to create surface");