Outline properly renders with filled text

Author: narilee2006

src_c/font.c

@@ -683,26 +683,37 @@ font_render(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
+    SDL_Surface *filled_with_outline_surf;
+
     if (outline_size > 0) {
         TTF_SetFontOutline(font, outline_size);
 
         if (!_create_font_surface(font, text, antialias, outline_color, backg,
                                   draw_backg, wraplength, &outline_surf)) {
             return NULL;
         }
-        SDL_SetSurfaceBlendMode(outline_surf, SDL_BLENDMODE_BLEND);
 
         TTF_SetFontOutline(font, 0);
 
-        // `surf` and `outline_surf` are **NOT** the same size.
-        SDL_Rect dstrect;
-        dstrect.x = outline_surf->w / 2 - surf->w / 2;
-        dstrect.y = outline_surf->h / 2 - surf->h / 2;
-        dstrect.w = surf->w;
-        dstrect.h = surf->h;
-        SDL_BlitSurface(surf, NULL, outline_surf, &dstrect);
+        filled_with_outline_surf = PG_CreateSurface(
+            outline_surf->w, outline_surf->h, SDL_PIXELFORMAT_RGBA32);
 
-        final = (PyObject *)pgSurface_New(outline_surf);
+        // `surf` and `outline_surf` are **NOT** the same size.
+        SDL_Rect outlinerect;
+        outlinerect.x = filled_with_outline_surf->w / 2 - outline_surf->w / 2;
+        outlinerect.y = filled_with_outline_surf->h / 2 - outline_surf->h / 2;
+        outlinerect.w = outline_surf->w;
+        outlinerect.h = outline_surf->h;
+        SDL_Rect fillrect;
+        fillrect.x = filled_with_outline_surf->w / 2 - surf->w / 2;
+        fillrect.y = filled_with_outline_surf->h / 2 - surf->h / 2;
+        fillrect.w = surf->w;
+        fillrect.h = surf->h;
+        SDL_BlitSurface(surf, NULL, filled_with_outline_surf, &fillrect);
+        SDL_BlitSurface(outline_surf, NULL, filled_with_outline_surf,
+                        &outlinerect);
+
+        final = (PyObject *)pgSurface_New(filled_with_outline_surf);
     }
     else {
         final = (PyObject *)pgSurface_New(surf);
@@ -712,6 +723,9 @@ font_render(PyObject *self, PyObject *args, PyObject *kwds)
         SDL_FreeSurface(surf);
         if (outline_surf != NULL)
             SDL_FreeSurface(outline_surf);
+
+        if (filled_with_outline_surf != NULL)
+            SDL_FreeSurface(filled_with_outline_surf);
     }
     return final;
 }