Add static ctor to DispatcherImpl to force late initialization of static UiThread property #2
Conversation
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
…herImpl via instance constructor
| @@ -109,7 +109,7 @@ public static void Initialize(Win32PlatformOptions options, IDispatcherImpl cust | |||
| .Bind<IKeyboardDevice>().ToConstant(WindowsKeyboardDevice.Instance) | |||
| .Bind<IPlatformSettings>().ToConstant(s_instance) | |||
| .Bind<IPlatformThreadingInterface>().ToConstant(s_instance) | |||
| .Bind<IDispatcherImpl>().ToConstant(customDispatcher ?? DispatcherImpl.UIThread) | |||
| .Bind<IDispatcherImpl>().ToConstant(customDispatcher ?? new DispatcherImpl(AvaloniaLocator.Current.GetService<IPlatformThreadingInterface>())) | |||
There was a problem hiding this comment.
can we just use s_instance instead of AvaloniaLocator.Current.GetService<IPlatformThreadingInterface>()?
There was a problem hiding this comment.
yes, my bad, it can be replaced to static instance. Here is the update #4
HermanKirshin
pushed a commit
that referenced
this pull request
Feb 2, 2022
…ut-keydown-handed-2 win32: Don't raise TextInput event when KeyDown was handled (Attempt #2)
DrunkyBard
pushed a commit
that referenced
this pull request
Mar 7, 2022
…ut-keydown-handed-2 win32: Don't raise TextInput event when KeyDown was handled (Attempt #2)
HermanKirshin
pushed a commit
that referenced
this pull request
Jul 3, 2023
…latform-interface Cleanup runtime platform classes #2
HermanKirshin
pushed a commit
that referenced
this pull request
Sep 16, 2024
* Add accessibility ID to the TrayPopupRoot on Windows * [Windows] Add left click and menu item click e2e tests for TrayIcon * [Windows] Add TrayIcon visibility toggle tests * Implement macOS tray icon tests * Make it easier to read tray icon logs * Try to handle win10 accessibility names * Try to upload PageSource * Set condition: always * Hopefully, it works on CI * Try to upload PageSource #2 * Fix win10, hopefully for the last time
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Win32Platform.Initialize method contains registration of Windows related components. It also includes registration of IDispatcherImpl that uses DispatcherImpl.UIThread as an instance.
DispatcherImpl.UIThread property retrieves IPlatformThreadingInterface by invoke of AvaloniaLocator.
The thing is that DispatcherImpl.UIThread doesn't have static constructor - it leads to the case when static property might be initialized before Win32Platform.Initialize method call. Such premature initialization raises the error because AvaloniaLocator returns null for IPlatformThreadingInterface.
Adding static constructor to DispatcherImpl forces JIT to generate the code that initializes static property at the moment of property invocation.