fix many

Author: Genouka

AutoExtractedAssets/Scripts/QiuUTMT Scripts/Resource Exporters/ExportAllRoomsToPNG.csx

@@ -16,7 +16,7 @@ if (exportFolder is null)
 SetProgressBar(null, "Rooms Exported", 0, Data.Rooms.Count);
 StartProgressBarUpdater();
 
-using TextureWorkerSkia worker = new();
+using TextureWorkerSkia worker = new TextureWorkerSkia();
 
 foreach (UndertaleRoom room in Data.Rooms)
 {

UndertaleModToolAvalonia.Android/NativeViews/SoraEditorAndroid.cs

@@ -45,13 +45,13 @@ public static void DoMeOnlyOnce()
             themeModel.Dark = true;
             themeRegistry.LoadTheme(themeModel);
             themeRegistry.SetTheme(themeName);
-            GrammarRegistry.Instance.LoadGrammars("textmate/language.json");    
+            GrammarRegistry.Instance.LoadGrammars("textmate/language.json");
         }
     }
     public IPlatformHandle CreateControl(IPlatformHandle parent, Func<IPlatformHandle> createDefault)
     {
         DoMeOnlyOnce();
-        var parentContext = (parent as AndroidViewControlHandle)?.View.Context  
+        var parentContext = (parent as AndroidViewControlHandle)?.View.Context
                             ?? global::Android.App.Application.Context;
 
         var codeEditor = new CodeEditor(parentContext);
@@ -66,19 +66,10 @@ public IPlatformHandle CreateControl(IPlatformHandle parent, Func<IPlatformHandl
         );
         codeEditor.EditorLanguage = language;
 
-        // Ensure the editor is focusable so it can receive touch events and show the
-        // text actions popup (copy/cut/paste/select all) on long press
-        codeEditor.Focusable = true;
-        codeEditor.FocusableInTouchMode = true;
-
-        // Ensure the editor is important for autofill so the system properly manages
-        // the input connection and text selection actions
-        codeEditor.ImportantForAutofill = (global::Android.Views.ImportantForAutofill)2;
-
         return new AndroidViewControlHandle(codeEditor);
     }
 
-    public void SetText(IPlatformHandle androidViewControlHandle, string text)  
+    public void SetText(IPlatformHandle androidViewControlHandle, string text)
     {
         var codeEditor = (androidViewControlHandle as AndroidViewControlHandle).View as CodeEditor;
         codeEditor.SetText(text);
@@ -93,46 +84,19 @@ public string GetText(IPlatformHandle androidViewControlHandle)
     public void SetOnTextChanged(IPlatformHandle androidViewControlHandle, Action<string> callback)
     {
         var codeEditor = (androidViewControlHandle as AndroidViewControlHandle).View as CodeEditor;
-        var eventClass = Java.Lang.Class.FromType(typeof(ContentChangeEvent));  
+        var eventClass = Java.Lang.Class.FromType(typeof(ContentChangeEvent));
         codeEditor.SubscribeAlways(
             eventClass,
             new TextChangedReceiver(callback, codeEditor)
         );
     }
 
-    public void SetVisible(IPlatformHandle androidViewControlHandle, bool visible)
-    {
-        var codeEditor = (androidViewControlHandle as AndroidViewControlHandle)?.View as CodeEditor;
-        if (codeEditor != null)
-        {
-            codeEditor.Visibility = visible ? (global::Android.Views.ViewStates)0 : (global::Android.Views.ViewStates)4;
-        }
-    }
-
-    public void RequestFocus(IPlatformHandle androidViewControlHandle)
-    {
-        var codeEditor = (androidViewControlHandle as AndroidViewControlHandle)?.View as CodeEditor;
-        if (codeEditor != null)
-        {
-            codeEditor.RequestFocus();
-        }
-    }
-
-    public void SetOnFocusChanged(IPlatformHandle androidViewControlHandle, Action<bool> callback)
-    {
-        var view = (androidViewControlHandle as AndroidViewControlHandle)?.View;
-        if (view != null)
-        {
-            view.FocusChange += (s, e) => callback(e.HasFocus);
-        }
-    }
-
     private class TextChangedReceiver : Java.Lang.Object, EventManager.INoUnsubscribeReceiver
     {
         private readonly Action<string> _callback;
         private readonly CodeEditor _editor;
 
-        public TextChangedReceiver(Action<string> callback, CodeEditor editor)  
+        public TextChangedReceiver(Action<string> callback, CodeEditor editor)
         {
             _callback = callback;
             _editor = editor;
@@ -143,19 +107,4 @@ public void OnEvent(Java.Lang.Object? evt)
             _callback?.Invoke(_editor.Text.ToString());
         }
     }
-
-    private class FocusChangeListener : Java.Lang.Object, global::Android.Views.View.IOnFocusChangeListener
-    {
-        private readonly Action<bool> _callback;
-
-        public FocusChangeListener(Action<bool> callback)
-        {
-            _callback = callback;
-        }
-
-        public void OnFocusChange(global::Android.Views.View? v, bool hasFocus)
-        {
-            _callback?.Invoke(hasFocus);
-        }
-    }
-}
+}

UndertaleModToolAvalonia/NativeViews/ISoraEditorAndroid.cs

@@ -6,12 +6,9 @@ namespace UndertaleModToolAvalonia.NativeViews;
 public interface ISoraEditorAndroid
 {
     public IPlatformHandle CreateControl(IPlatformHandle parent, Func<IPlatformHandle> createDefault);
-    public void SetText(IPlatformHandle androidViewControlHandle, string text); 
+    public void SetText(IPlatformHandle androidViewControlHandle, string text);
     public string GetText(IPlatformHandle androidViewControlHandle);
     public void SetOnTextChanged(IPlatformHandle androidViewControlHandle, Action<string> callback);
-    public void SetVisible(IPlatformHandle androidViewControlHandle, bool visible);
-    public void RequestFocus(IPlatformHandle androidViewControlHandle);
-    public void SetOnFocusChanged(IPlatformHandle androidViewControlHandle, Action<bool> callback);
 
     public static ISoraEditorAndroid? Implementation { get; set; }
-}
+}

UndertaleModToolAvalonia/NativeViews/SoraEditorControl.cs

@@ -2,8 +2,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.Input;
-using Avalonia.Interactivity;
 using Avalonia.Platform;
 using AvaloniaEdit;
 using AvaloniaEdit.Document;
@@ -15,13 +13,9 @@ public class SoraEditorControl: NativeControlHost
 {
     private IPlatformHandle? _impl;
     private string _initialText = string.Empty;
-    private bool _isSyncingDocument;
-    private bool _isSyncingFocus;
-
 
     public SoraEditorControl()
     {
-        Focusable = true;
     }
 
     public string Text
@@ -39,8 +33,8 @@ public string Text
     public static readonly StyledProperty<TextDocument> DocumentProperty = TextView.DocumentProperty.AddOwner<SoraEditorControl>();
     public TextDocument Document
     {
-        get => this.GetValue<TextDocument>(SoraEditorControl.DocumentProperty); 
-        set => this.SetValue(SoraEditorControl.DocumentProperty, value);        
+        get => this.GetValue<TextDocument>(SoraEditorControl.DocumentProperty);
+        set => this.SetValue(SoraEditorControl.DocumentProperty, value);
     }
 
     /// <summary>
@@ -53,69 +47,14 @@ public static ISoraEditorAndroid? Factory
         get => ISoraEditorAndroid.Implementation;
     }
 
-    public new bool Focus()
-    {
-        // Delegate focus to the native Android editor
-        if (_impl is not null && Factory is not null)
-        {
-            Factory.RequestFocus(_impl);
-            return true;
-        }
-        return base.Focus();
-    }
-
-    protected override void OnGotFocus(GotFocusEventArgs e)
-    {
-        base.OnGotFocus(e);
-
-        // When Avalonia sets focus to this control, delegate to the native editor
-        if (!_isSyncingFocus && _impl is not null && Factory is not null)
-        {
-            _isSyncingFocus = true;
-            try
-            {
-                Factory.RequestFocus(_impl);
-            }
-            finally
-            {
-                _isSyncingFocus = false;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Called when the native Android editor gains or loses focus.
-    /// When the native control gains focus (e.g. from a user tap), we claim
-    /// Avalonia focus so that the framework does not redirect it elsewhere.
-    /// </summary>
-    private void OnNativeFocusChanged(bool hasFocus)
-    {
-        if (_isSyncingFocus)
-            return;
-
-        if (hasFocus)
-        {
-            _isSyncingFocus = true;
-            try
-            {
-                // Claim Avalonia focus so the framework knows this control is active
-                base.Focus();
-            }
-            finally
-            {
-                _isSyncingFocus = false;
-            }
-        }
-    }
-
     protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle parent)
     {
         if (Factory is null)
             return base.CreateNativeControlCore(parent);
 
         _impl = Factory.CreateControl(parent, () => base.CreateNativeControlCore(parent));
 
-        // Set initial text if it was set before the control was created        
+        // Set initial text if it was set before the control was created
         if (!string.IsNullOrEmpty(_initialText))
         {
             Factory.SetText(_impl, _initialText);
@@ -131,13 +70,10 @@ protected override IPlatformHandle CreateNativeControlCore(IPlatformHandle paren
         // Hook up native text changed callback
         Factory.SetOnTextChanged(_impl, OnNativeTextChanged);
 
-        // Hook up native focus changed callback for bidirectional focus sync
-        Factory.SetOnFocusChanged(_impl, OnNativeFocusChanged);
-
         return _impl;
     }
 
-    protected override void DestroyNativeControlCore(IPlatformHandle control)   
+    protected override void DestroyNativeControlCore(IPlatformHandle control)
     {
         _impl = null;
         base.DestroyNativeControlCore(control);
@@ -149,84 +85,13 @@ protected override void DestroyNativeControlCore(IPlatformHandle control)
     private void OnNativeTextChanged(string newText)
     {
         // Sync back to Document if bound
-        _isSyncingDocument = true;
-        try
-        {
-            var doc = Document;
-            if (doc != null && doc.Text != newText)
-            {
-                doc.Text = newText;
-            }
-        }
-        finally
+        var doc = Document;
+        if (doc != null && doc.Text != newText)
         {
-            _isSyncingDocument = false;
+            doc.Text = newText;
         }
 
         // Raise TextChanged event
         TextChanged?.Invoke(this, EventArgs.Empty);
     }
-
-    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-    {
-        base.OnPropertyChanged(change);
-
-        if (change.Property == DocumentProperty)
-        {
-            if (change.NewValue is TextDocument newDoc)
-            {
-                // Sync document text to native editor
-                if (_impl is not null && Factory is not null)
-                {
-                    try
-                    {
-                        Factory.SetText(_impl, newDoc.Text);
-                    }
-                    catch (ObjectDisposedException)
-                    {
-                        // Native control disposed, will be recreated when tab is re-selected
-                    }
-                }
-                else
-                {
-                    _initialText = newDoc.Text;
-                }
-
-                // Listen for document text changes
-                newDoc.TextChanged += OnDocumentTextChanged;
-            }
-
-            if (change.OldValue is TextDocument oldDoc)
-            {
-                oldDoc.TextChanged -= OnDocumentTextChanged;
-            }
-        }
-        else if (change.Property == IsVisibleProperty)
-        {
-            // Propagate visibility changes to the native Android view so it doesn't
-            // render on top of overlay dialogs
-            if (_impl is not null && Factory is not null)
-            {
-                Factory.SetVisible(_impl, IsVisible);
-            }
-        }
-    }
-
-    private void OnDocumentTextChanged(object? sender, EventArgs e)
-    {
-        if (_isSyncingDocument || _impl is null)
-            return;
-
-        try
-        {
-            if (Factory is not null && sender is TextDocument doc)
-            {
-                Factory.SetText(_impl, doc.Text);
-            }
-        }
-        catch (ObjectDisposedException)
-        {
-            // Native control has been disposed (e.g. tab switched away), ignore
-        }
-    }
-}
+}

UndertaleModToolAvalonia/ResourceViews/UndertaleCodeView.axaml

@@ -76,7 +76,7 @@
                 <ThemeVariantScope RequestedThemeVariant="Dark">
                     <nativeViews:SoraEditorControl x:Name="GMLTextEditorSora"
                                                    Document="{Binding GMLTextDocument}"
-                                                   LostFocus="GMLTextEditor_LostFocus"
+
                                                    TextChanged="GMLTextEditor_TextChanged">
                     </nativeViews:SoraEditorControl>
                 </ThemeVariantScope>
@@ -85,7 +85,7 @@
                 <ThemeVariantScope RequestedThemeVariant="Dark">
                     <nativeViews:SoraEditorControl x:Name="ASMTextEditorSora"
                                                    Document="{Binding ASMTextDocument}"
-                                                   LostFocus="ASMTextEditor_LostFocus"
+
                                                    TextChanged="ASMTextEditor_TextChanged">
                     </nativeViews:SoraEditorControl>
                 </ThemeVariantScope>