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

WinForms: Handle MainForm changes #2598

Merged
merged 1 commit into from
Dec 11, 2023
Merged

WinForms: Handle MainForm changes #2598

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
7 changes: 3 additions & 4 deletions src/Eto.WinForms/Forms/ApplicationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class ApplicationHandler : WidgetHandler<object, Application, Application
bool quitting;
readonly Thread mainThread;
SynchronizationContext context;
swf.ApplicationContext applicationContext = new swf.ApplicationContext();
public static bool EnableScrollingUnderMouse = true;
public static bool BubbleMouseEvents = true;
public static bool BubbleKeyEvents = true;
Expand Down Expand Up @@ -115,10 +116,7 @@ public void Run()

if (!quitting)
{
if (Widget.MainForm != null && Widget.MainForm.Loaded)
swf.Application.Run((swf.Form)Widget.MainForm.ControlObject);
else
swf.Application.Run();
swf.Application.Run(applicationContext);
}
}
else
Expand Down Expand Up @@ -230,6 +228,7 @@ public void Attach(object context)

public void OnMainFormChanged()
{
applicationContext.MainForm = (swf.Form)Widget.MainForm.ControlObject;
}

public void Quit()
Expand Down
Loading