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

Fix cursor visible on Linux when in 3D mode

Browse source
This commit is contained in:
Magnus Norddahl 2020-09-13 23:43:11 +02:00
parent b740cadc13
commit 90831bd630
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/Actions/MouseInput.cs
View file

@ -34,6 +34,7 @@ namespace CodeImp.DoomBuilder.Actions
private RawMouse mouse;
private bool firstProcess = true;
private Point lastPos = new Point();
private Control source;
#endregion
@ -42,6 +43,8 @@ namespace CodeImp.DoomBuilder.Actions
// Constructor
public MouseInput(Control source)
{
this.source = source;
// Start mouse input
try
{
@ -88,7 +91,7 @@ namespace CodeImp.DoomBuilder.Actions
{
Point pos = Cursor.Position;
Rectangle clipBox = Cursor.Clip;
Rectangle clipBox = source.RectangleToScreen(source.ClientRectangle); //Cursor.Clip;
Cursor.Position = new Point(clipBox.X + clipBox.Width / 2, clipBox.Y + clipBox.Height / 2);
if (firstProcess)

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

@ -1230,7 +1230,21 @@ 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;
#if MONO_WINFORMS
// A beautiful transparent cursor, just for you mono!
string emptycursor =
"AAACAAEAICACAAAAAAAwAQAAFgAAACgAAAAgAAAAQAAAAAEAAQAAAAAAgAAAAAAAAAAAAAAAAgAA" +
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////////////////////////////////" +
"////////////////////////////////////////////////////////////////////////////" +
"//////////////////////////////////////////////////////8=";
using (var stream = new MemoryStream(System.Convert.FromBase64String(emptycursor)))
{
Cursor.Current = new Cursor(stream);
}
#endif
}
}
@ -1248,7 +1262,9 @@ 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;
#if MONO_WINFORMS
Cursor.Current = Cursors.Default;
#endif
}
}

5
Source/Native/RawMouse.cpp
View file

@ -172,8 +172,11 @@ extern "C"
RawMouse* RawMouse_New(void* hwnd)
{
//return new RawMouse(hwnd);
#ifdef WIN32
return new RawMouse(hwnd);
#else
return nullptr;
#endif
}
void RawMouse_Delete(RawMouse* mouse)