Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wpf: Fix startup when attaching to a WPF application #2667

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Wpf: Fix startup when attaching to a WPF application #2667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Eto.Wpf/Forms/ApplicationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ protected override void Initialize()
{
Control = new sw.Application { ShutdownMode = sw.ShutdownMode.OnExplicitShutdown };
sw.Forms.Application.EnableVisualStyles();
Control.Startup += (s, e) => HandleStartup();
}
else
{
HandleStartup();
}

// Prevent race condition with volatile font collection field in WPF when measuring a window the first time
Expand All @@ -97,7 +102,6 @@ protected override void Initialize()

dispatcher = sw.Application.Current.Dispatcher ?? Dispatcher.CurrentDispatcher;
instance = this;
Control.Startup += HandleStartup;
ApplyThemes();
base.Initialize();
}
Expand All @@ -114,7 +118,7 @@ void OnCurrentDomainUnhandledException(object sender, System.UnhandledExceptionE
Callback.OnUnhandledException(Widget, unhandledExceptionArgs);
}

void HandleStartup(object sender, sw.StartupEventArgs e)
void HandleStartup()
{
IsStarted = true;
IsActive = Win32.ApplicationIsActivated();
Expand Down
Loading