forked from unoplatform/uno
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Cast to FrameworkElement/Window when accessing Loading/Activated…
… to avoid issues when shadowing
- Loading branch information
1 parent
98c2aec
commit 5648bea
Showing
27 changed files
with
541 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...tors.Tests/XamlCodeGeneratorTests/Out/TMEWSFEL/XamlCodeGenerator_GlobalStaticResources.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // <autogenerated /> | ||
| namespace MyProject | ||
| { | ||
| /// <summary> | ||
| /// Contains all the static resources defined for the application | ||
| /// </summary> | ||
| public sealed partial class GlobalStaticResources | ||
| { | ||
| static bool _initialized; | ||
| private static bool _stylesRegistered; | ||
| private static bool _dictionariesRegistered; | ||
| internal static global::Uno.UI.Xaml.XamlParseContext __ParseContext_ { get; } = new global::Uno.UI.Xaml.XamlParseContext() | ||
| { | ||
| AssemblyName = "TestProject", | ||
| } | ||
| ; | ||
|
|
||
| static GlobalStaticResources() | ||
| { | ||
| Initialize(); | ||
| } | ||
| public static void Initialize() | ||
| { | ||
| if (!_initialized) | ||
| { | ||
| _initialized = true; | ||
| global::Uno.UI.GlobalStaticResources.Initialize(); | ||
| global::Uno.UI.GlobalStaticResources.RegisterDefaultStyles(); | ||
| global::Uno.UI.GlobalStaticResources.RegisterResourceDictionariesBySource(); | ||
| } | ||
| } | ||
| public static void RegisterDefaultStyles() | ||
| { | ||
| if(!_stylesRegistered) | ||
| { | ||
| _stylesRegistered = true; | ||
| RegisterDefaultStyles_MainPage_d6cd66944958ced0c513e0a04797b51d(); | ||
| } | ||
| } | ||
| // Register ResourceDictionaries using ms-appx:/// syntax, this is called for external resources | ||
| public static void RegisterResourceDictionariesBySource() | ||
| { | ||
| if(!_dictionariesRegistered) | ||
| { | ||
| _dictionariesRegistered = true; | ||
| } | ||
| } | ||
| // Register ResourceDictionaries using ms-resource:/// syntax, this is called for local resources | ||
| internal static void RegisterResourceDictionariesBySourceLocal() | ||
| { | ||
| } | ||
| static partial void RegisterDefaultStyles_MainPage_d6cd66944958ced0c513e0a04797b51d(); | ||
|
|
||
| } | ||
| } |
2 changes: 2 additions & 0 deletions
2
...tors.Tests/XamlCodeGeneratorTests/Out/TMEWSFEL/XamlCodeGenerator_LocalizationResources.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // <auto-generated /> | ||
| [assembly: global::System.Reflection.AssemblyMetadata("UnoHasLocalizationResources", "False")] |
143 changes: 143 additions & 0 deletions
143
...eneratorTests/Out/TMEWSFEL/XamlCodeGenerator_MainPage_d6cd66944958ced0c513e0a04797b51d.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // <autogenerated /> | ||
| #pragma warning disable CS0114 | ||
| #pragma warning disable CS0108 | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Linq; | ||
| using Uno.UI; | ||
| using Uno.UI.Xaml; | ||
| using Microsoft.UI.Xaml; | ||
| using Microsoft.UI.Xaml.Controls; | ||
| using Microsoft.UI.Xaml.Controls.Primitives; | ||
| using Microsoft.UI.Xaml.Data; | ||
| using Microsoft.UI.Xaml.Documents; | ||
| using Microsoft.UI.Xaml.Media; | ||
| using Microsoft.UI.Xaml.Media.Animation; | ||
| using Microsoft.UI.Xaml.Shapes; | ||
| using Windows.UI.Text; | ||
| using Uno.Extensions; | ||
| using Uno; | ||
| using Uno.UI.Helpers; | ||
| using Uno.UI.Helpers.Xaml; | ||
| using MyProject; | ||
|
|
||
| #if __ANDROID__ | ||
| using _View = Android.Views.View; | ||
| #elif __IOS__ | ||
| using _View = UIKit.UIView; | ||
| #elif __MACOS__ | ||
| using _View = AppKit.NSView; | ||
| #else | ||
| using _View = Microsoft.UI.Xaml.UIElement; | ||
| #endif | ||
|
|
||
| namespace TestRepro | ||
| { | ||
| partial class MainPage : global::TestRepro.BasePage | ||
| { | ||
| [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)] | ||
| private const string __baseUri_prefix_MainPage_d6cd66944958ced0c513e0a04797b51d = "ms-appx:///TestProject/"; | ||
| [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)] | ||
| private const string __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d = "ms-appx:///TestProject/"; | ||
| private global::Microsoft.UI.Xaml.NameScope __nameScope = new global::Microsoft.UI.Xaml.NameScope(); | ||
| private void InitializeComponent() | ||
| { | ||
| NameScope.SetNameScope(this, __nameScope); | ||
| var __that = this; | ||
| base.IsParsing = true; | ||
| // Source 0\MainPage.xaml (Line 1:2) | ||
| ; | ||
|
|
||
| this | ||
| .GenericApply(((c0) => | ||
| { | ||
| // Source 0\MainPage.xaml (Line 1:2) | ||
|
|
||
| // WARNING Property c0.base does not exist on {using:TestRepro}BasePage, the namespace is http://www.w3.org/XML/1998/namespace. This error was considered irrelevant by the XamlFileGenerator | ||
| } | ||
| )) | ||
| .GenericApply(((c1) => | ||
| { | ||
| /* _isTopLevelDictionary:False */ | ||
| __that._component_0 = c1; | ||
| // Class TestRepro.MainPage | ||
| global::Uno.UI.ResourceResolverSingleton.Instance.ApplyResource(c1, global::TestRepro.BasePage.BackgroundProperty, "ApplicationPageBackgroundThemeBrush", isThemeResourceExtension: true, isHotReloadSupported: false, context: global::MyProject.GlobalStaticResources.__ParseContext_); | ||
| global::Uno.UI.FrameworkElementHelper.SetBaseUri(c1, __baseUri_MainPage_d6cd66944958ced0c513e0a04797b51d); | ||
| c1.CreationComplete(); | ||
| } | ||
| )) | ||
| ; | ||
| OnInitializeCompleted(); | ||
|
|
||
| Bindings = new MainPage_Bindings(this); | ||
| ((global::Microsoft.UI.Xaml.FrameworkElement)this).Loading += (s, e) => | ||
| { | ||
| __that.Bindings.UpdateResources(); | ||
| } | ||
| ; | ||
| } | ||
| partial void OnInitializeCompleted(); | ||
| private global::Microsoft.UI.Xaml.Markup.ComponentHolder _component_0_Holder = new global::Microsoft.UI.Xaml.Markup.ComponentHolder(isWeak: true); | ||
| private global::TestRepro.BasePage _component_0 | ||
| { | ||
| get | ||
| { | ||
| return (global::TestRepro.BasePage)_component_0_Holder.Instance; | ||
| } | ||
| set | ||
| { | ||
| _component_0_Holder.Instance = value; | ||
| } | ||
| } | ||
| private interface IMainPage_Bindings | ||
| { | ||
| void Initialize(); | ||
| void Update(); | ||
| void UpdateResources(); | ||
| void StopTracking(); | ||
| void NotifyXLoad(string name); | ||
| } | ||
| #pragma warning disable 0169 // Suppress unused field warning in case Bindings is not used. | ||
| private IMainPage_Bindings Bindings; | ||
| #pragma warning restore 0169 | ||
| [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
| private class MainPage_Bindings : IMainPage_Bindings | ||
| { | ||
| #if UNO_HAS_UIELEMENT_IMPLICIT_PINNING | ||
| private global::System.WeakReference _ownerReference; | ||
| private global::TestRepro.MainPage Owner { get => (global::TestRepro.MainPage)_ownerReference?.Target; set => _ownerReference = new global::System.WeakReference(value); } | ||
| #else | ||
| private global::TestRepro.MainPage Owner { get; set; } | ||
| #endif | ||
| public MainPage_Bindings(global::TestRepro.MainPage owner) | ||
| { | ||
| Owner = owner; | ||
| } | ||
| void IMainPage_Bindings.NotifyXLoad(string name) | ||
| { | ||
| } | ||
| void IMainPage_Bindings.Initialize() | ||
| { | ||
| } | ||
| void IMainPage_Bindings.Update() | ||
| { | ||
| var owner = Owner; | ||
| } | ||
| void IMainPage_Bindings.UpdateResources() | ||
| { | ||
| var owner = Owner; | ||
| owner._component_0.UpdateResourceBindings(resourceContextProvider: null); | ||
| } | ||
| void IMainPage_Bindings.StopTracking() | ||
| { | ||
| } | ||
| } | ||
| } | ||
| } | ||
| namespace MyProject | ||
| { | ||
| static class MainPage_d6cd66944958ced0c513e0a04797b51dXamlApplyExtensions | ||
| { | ||
| } | ||
| } |
Oops, something went wrong.