Skip to content

Commit

Permalink
Wpf: Fix startup when attaching to a WPF application
Browse files Browse the repository at this point in the history
  • Loading branch information
cwensley committed Jun 26, 2024
1 parent cbbb2e5 commit 39b49e7
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/Eto.Wpf/Forms/ApplicationHandler.cs
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

0 comments on commit 39b49e7

Please sign in to comment.