stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 22:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some input issues on non-Windows systems (PR#467 by Talon1024)

Browse source 
* Fix some input issues on non-Windows systems

Disable the main menu bar when the 3D view is active.
Disable mouse input processing and "exclusive mouse input" until each editing dialog closes.

* Enable front/backgroup in LinedefEditForm{,UDMF} in the Setup method

The Setup method is called to specify which linedefs are being edited by the LinedefEditForm, and set up the dialog appropriately, so the front/backgroup should be enabled in the Setup method, at the same time the front/backside check boxes are checked or unchecked.
This commit is contained in:
Kevin Caccamo 2020-09-13 12:40:09 -04:00 committed by GitHub
parent 3218218dcc
commit fdfeba1731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 79 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/Windows/LinedefEditForm.cs
View file

@ -87,9 +87,6 @@ namespace CodeImp.DoomBuilder.Windows
{
// Initialize
InitializeComponent();
#if MONO_WINFORMS
frontgroup.Enabled = true;
#endif
// Fill flags lists
foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefFlags)
@ -191,7 +188,13 @@ namespace CodeImp.DoomBuilder.Windows
// Front side and back side checkboxes
frontside.Checked = (fl.Front != null);
#if MONO_WINFORMS
frontgroup.Enabled = (fl.Front != null);
#endif
backside.Checked = (fl.Back != null);
#if MONO_WINFORMS
backgroup.Enabled = (fl.Back != null);
#endif
// Front settings
if(fl.Front != null)

9
Source/Core/Windows/LinedefEditFormUDMF.cs
View file

@ -135,9 +135,6 @@ namespace CodeImp.DoomBuilder.Windows
{
// Initialize
InitializeComponent();
#if MONO_WINFORMS
frontgroup.Enabled = true;
#endif
// Widow setup
if(General.Settings.StoreSelectedEditTab)
@ -307,7 +304,13 @@ namespace CodeImp.DoomBuilder.Windows
// Front side and back side checkboxes
frontside.Checked = (fl.Front != null);
#if MONO_WINFORMS
frontgroup.Enabled = (fl.Front != null);
#endif
backside.Checked = (fl.Back != null);
#if MONO_WINFORMS
backgroup.Enabled = (fl.Back != null);
#endif
// Front settings
if(fl.Front != null)

69
Source/Core/Windows/MainForm.cs
View file

@ -1230,6 +1230,7 @@ namespace CodeImp.DoomBuilder.Windows
Cursor.Position = display.PointToScreen(new Point(display.ClientSize.Width / 2, display.ClientSize.Height / 2)); //mxd
Cursor.Clip = display.RectangleToScreen(display.ClientRectangle);
Cursor.Hide();
this.menumain.Enabled = false;
}
}
@ -1247,6 +1248,7 @@ namespace CodeImp.DoomBuilder.Windows
Cursor.Clip = Rectangle.Empty;
Cursor.Position = display.PointToScreen(new Point(display.ClientSize.Width / 2, display.ClientSize.Height / 2));
Cursor.Show();
this.menumain.Enabled = true;
}
}
@ -4003,8 +4005,17 @@ namespace CodeImp.DoomBuilder.Windows
// Show sector edit dialog
VertexEditForm f = new VertexEditForm();
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(vertices, allowPositionChange);
#if !NO_WIN32
EnableProcessing(); //mxd
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
DialogResult result = f.ShowDialog(this);
@ -4030,8 +4041,17 @@ namespace CodeImp.DoomBuilder.Windows
{
LinedefEditFormUDMF f = new LinedefEditFormUDMF(selectfront, selectback);
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(lines, selectfront, selectback);
EnableProcessing(); //mxd
#if !NO_WIN32
EnableProcessing();
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
@ -4042,8 +4062,17 @@ namespace CodeImp.DoomBuilder.Windows
{
LinedefEditForm f = new LinedefEditForm();
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(lines);
EnableProcessing(); //mxd
#if !NO_WIN32
EnableProcessing();
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
@ -4064,8 +4093,17 @@ namespace CodeImp.DoomBuilder.Windows
{
SectorEditFormUDMF f = new SectorEditFormUDMF();
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(sectors);
#if !NO_WIN32
EnableProcessing(); //mxd
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
@ -4076,8 +4114,17 @@ namespace CodeImp.DoomBuilder.Windows
{
SectorEditForm f = new SectorEditForm();
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(sectors);
#if !NO_WIN32
EnableProcessing(); //mxd
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
@ -4098,8 +4145,17 @@ namespace CodeImp.DoomBuilder.Windows
{
ThingEditFormUDMF f = new ThingEditFormUDMF();
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(things);
#if !NO_WIN32
EnableProcessing(); //mxd
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);
@ -4110,8 +4166,17 @@ namespace CodeImp.DoomBuilder.Windows
{
ThingEditForm f = new ThingEditForm();
DisableProcessing(); //mxd
#if NO_WIN32
BreakExclusiveMouseInput();
f.Closed += (object sender, EventArgs e) => {
ResumeExclusiveMouseInput();
EnableProcessing(); //mxd
};
#endif
f.Setup(things);
#if !NO_WIN32
EnableProcessing(); //mxd
#endif
f.OnValuesChanged += EditForm_OnValuesChanged;
editformopen = true; //mxd
result = f.ShowDialog(this);