Krzysztof Krysiński 6 месяцев назад
Родитель
Сommit
ae55e0d778

+ 1 - 1
src/Drawie

@@ -1 +1 @@
-Subproject commit 135600d52af3806ab9bf654d783594683bc756e4
+Subproject commit bc1f88330f79f081574c5f3350ba351d6f88273f

+ 0 - 2
src/PixiEditor/Views/MainView.axaml

@@ -16,8 +16,6 @@
         <viewModels1:ViewModelMain />
     </Design.DataContext>
     <Grid DragDrop.AllowDrop="True" Name="DropGrid">
-        <!--A hacky way to fix first element not rendering in OpenGL render api--> 
-        <visuals:TextureControl Name="OpenGlInitDummy" IsVisible="False"/>
         <DockPanel>
             <main1:MainTitleBar DockPanel.Dock="Top" DataContext="{Binding MenuBarViewModel}" />
             <Grid Focusable="True" Name="FocusableGrid">

+ 0 - 15
src/PixiEditor/Views/MainView.axaml.cs

@@ -32,21 +32,6 @@ public partial class MainView : UserControl
 
     private void OnLoaded(object? sender, RoutedEventArgs e)
     {
-        // hacky way to fix first element not rendering
-        // feel free to make a proper fix inside Drawie
-        if (IDrawieInteropContext.Current is OpenGlInteropContext)
-        {
-            OpenGlInitDummy.IsVisible = true;
-            OpenGlInitDummy.Texture = new Texture(new Texture(new VecI(1, 1)));
-            OpenGlInitDummy.QueueNextFrame();
-            Dispatcher.UIThread.Post(() =>
-            {
-                OpenGlInitDummy.Texture.Dispose();
-                OpenGlInitDummy.Texture = null;
-                OpenGlInitDummy.IsVisible = false;
-            });
-        }
-
         if (DataContext is ViewModelMain vm)
         {
             vm.OnStartup();

+ 4 - 1
src/PixiEditor/Views/Visuals/PixiFilePreviewImage.cs

@@ -1,6 +1,8 @@
 using Avalonia;
 using Avalonia.Threading;
 using Drawie.Backend.Core;
+using Drawie.Backend.Core.Bridge;
+using Drawie.Backend.Core.Surfaces;
 using PixiEditor.Extensions.Exceptions;
 using PixiEditor.Helpers;
 using PixiEditor.Models;
@@ -108,6 +110,7 @@ internal class PixiFilePreviewImage : TextureControl
         try
         {
             loaded = Texture.Load(textureBytes);
+            return loaded;
         }
         catch (RecoverableException)
         {
@@ -135,7 +138,7 @@ internal class PixiFilePreviewImage : TextureControl
 
         var newSize = new VecI((int)(surface.Size.X * factor), (int)(surface.Size.Y * factor));
 
-        var scaledBitmap = surface.Resize(newSize, ResizeMethod.HighQuality);
+        var scaledBitmap = surface.Resize(newSize, FilterQuality.High);
 
         surface.Dispose();
         return scaledBitmap;