fix

Author: MeetWq

meme_generator_memes/src/memes/always.rs

@@ -44,17 +44,19 @@ fn always_normal(images: Vec<InputImage>) -> Result<Vec<u8>, Error> {
     canvas.clear(Color::WHITE);
 
     canvas
-        .draw_text_area(
+        .draw_text_area_auto_font_size(
             IRect::from_ltrb(20, h1 + 5, 280, frame_h - 5),
             "要我一直",
+            20.0,
             60.0,
             text_params!(text_align = TextAlign::Right),
         )
         .unwrap();
     canvas
-        .draw_text_area(
+        .draw_text_area_auto_font_size(
             IRect::from_ltrb(400, h1 + 5, 480, frame_h - 5),
             "吗",
+            20.0,
             60.0,
             text_params!(text_align = TextAlign::Left),
         )
@@ -97,17 +99,19 @@ fn always_always(images: Vec<InputImage>, loop_: bool) -> Result<Vec<u8>, Error>
     canvas.clear(Color::WHITE);
 
     canvas
-        .draw_text_area(
+        .draw_text_area_auto_font_size(
             IRect::from_ltrb(20, img_big_h + 5, 280, frame_h - 5),
             "要我一直",
+            20.0,
             60.0,
             text_params!(text_align = TextAlign::Right),
         )
         .unwrap();
     canvas
-        .draw_text_area(
+        .draw_text_area_auto_font_size(
             IRect::from_ltrb(400, img_big_h + 5, 480, frame_h - 5),
             "吗",
+            20.0,
             60.0,
             text_params!(text_align = TextAlign::Left),
         )

meme_generator_memes/src/memes/play_together.rs

@@ -4,7 +4,7 @@ use meme_generator_core::error::Error;
 use meme_generator_utils::{
     builder::InputImage,
     encoder::{FrameAlign, GifInfo, make_gif_or_combined_gif},
-    image::ImageExt,
+    image::{Fit, ImageExt},
     tools::{load_image, local_date, new_surface},
 };
 
@@ -36,7 +36,7 @@ fn play_together(images: Vec<InputImage>, _: Vec<String>, _: NoOptions) -> Resul
 
     let func = |i: usize, images: Vec<Image>| {
         let (x, y, w, h) = params[i];
-        let screen = images[0].resize_exact((w, h));
+        let screen = images[0].resize_fit((w, h), Fit::Cover);
         let frame = load_image(format!("play_together/{i:02}.png"))?;
         let mut surface = new_surface(frame.dimensions());
         let canvas = surface.canvas();