fix(Studio): Game Info rendering on WPF

EverestAPI · Jan 26, 2025 · d146611 · d146611
1 parent 17f534f
commit d146611
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/Studio/CelesteStudio.WPF/SkiaDrawableHandler.cs b/Studio/CelesteStudio.WPF/SkiaDrawableHandler.cs
@@ -29,22 +29,27 @@ protected override void OnRender(DrawingContext drawingContext) {
             int width = (int)(drawable.DrawWidth * dpiX);
             int height = (int)(drawable.DrawHeight * dpiY);
 
-            if (width == 0 || height == 0) {
-                return;
-            }
-
             if (drawable.CanDraw) {
                 if (bitmap == null || surface == null || width != bitmap.PixelWidth || height != bitmap.PixelHeight || Settings.Instance.WPFSkiaHack) {
-                    const double bitmapDpi = 96.0;
-                    bitmap = new WriteableBitmap(width, height, bitmapDpi * dpiX, bitmapDpi * dpiY, PixelFormats.Pbgra32, null);
-
-                    surface?.Dispose();
-                    surface = SKSurface.Create(new SKImageInfo(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul), bitmap.BackBuffer, bitmap.BackBufferStride, new SKSurfaceProperties(SKPixelGeometry.Unknown));
-                    surface.Canvas.Scale((float)dpiX, (float)dpiY);
-                    surface.Canvas.Save();
+                    if (width == 0 || height == 0) {
+                        // A zero sized surface causes issues, so use a null 1x1
+                        // drawable.Draw() still needs to be called, so simply skipping render is not an option
+                        bitmap = null;
+
+                        surface?.Dispose();
+                        surface = SKSurface.CreateNull(1, 1);
+                    } else {
+                        const double bitmapDpi = 96.0;
+                        bitmap = new WriteableBitmap(width, height, bitmapDpi * dpiX, bitmapDpi * dpiY, PixelFormats.Pbgra32, null);
+
+                        surface?.Dispose();
+                        surface = SKSurface.Create(new SKImageInfo(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul), bitmap.BackBuffer, bitmap.BackBufferStride, new SKSurfaceProperties(SKPixelGeometry.Unknown));
+                        surface.Canvas.Scale((float)dpiX, (float)dpiY);
+                        surface.Canvas.Save();
+                    }
                 }
 
-                bitmap.Lock();
+                bitmap?.Lock();
 
                 var canvas = surface.Canvas;
                 using (new SKAutoCanvasRestore(surface.Canvas, true)) {
@@ -54,9 +59,11 @@ protected override void OnRender(DrawingContext drawingContext) {
                 }
                 canvas.Flush();
 
-                bitmap.AddDirtyRect(new Int32Rect(0, 0, width, height));
-                drawingContext.DrawImage(bitmap, new Rect(drawable.DrawX, drawable.DrawY, width / dpiX, height / dpiY));
-                bitmap.Unlock();
+                if (bitmap != null) {
+                    bitmap.AddDirtyRect(new Int32Rect(0, 0, width, height));
+                    drawingContext.DrawImage(bitmap, new Rect(drawable.DrawX, drawable.DrawY, width / dpiX, height / dpiY));
+                    bitmap.Unlock();
+                }
             } else {
                 drawable.Invalidate();
             }