vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unstable 1.8.4.0

Browse Source
This commit is contained in:
Markus Isberg
2025-03-12 12:56:27 +00:00
parent a4c3e868e4
commit a4a3427e4e
627 changed files with 29860 additions and 10018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Libraries/MonoGame.Framework/Src/MonoGame.Framework/Display.cs Normal file
View File

@@ -0,0 +1,11 @@
namespace Microsoft.Xna.Framework
{
public static class Display
{
public static int GetNumberOfDisplays()
=> Sdl.Display.GetNumVideoDisplays();
public static string GetDisplayName(int displayIndex)
=> Sdl.Display.GetDisplayName(displayIndex);
}
}

2
Libraries/MonoGame.Framework/Src/MonoGame.Framework/GameWindow.cs
View File

@@ -76,6 +76,8 @@ namespace Microsoft.Xna.Framework {
}
}
public virtual int TargetDisplay { get => 0; set => throw new NotImplementedException(); }
internal MouseState MouseState;
internal TouchPanelState TouchPanelState;

1
Libraries/MonoGame.Framework/Src/MonoGame.Framework/MonoGame.Framework.Linux.NetStandard.csproj
View File

@@ -38,6 +38,7 @@
<Compile Include="Clipboard.cs" />
<Compile Include="FileDropEventArgs.cs" />
<Compile Include="MessageBox.cs" />
<Compile Include="Display.cs" />
<Compile Include="CurveContinuity.cs" />
<Compile Include="Curve.cs" />
<Compile Include="CurveKeyCollection.cs" />

1
Libraries/MonoGame.Framework/Src/MonoGame.Framework/MonoGame.Framework.MacOS.NetStandard.csproj
View File

@@ -38,6 +38,7 @@
<Compile Include="Clipboard.cs" />
<Compile Include="FileDropEventArgs.cs" />
<Compile Include="MessageBox.cs" />
<Compile Include="Display.cs" />
<Compile Include="CurveContinuity.cs" />
<Compile Include="Curve.cs" />
<Compile Include="CurveKeyCollection.cs" />

1
Libraries/MonoGame.Framework/Src/MonoGame.Framework/MonoGame.Framework.Windows.NetStandard.csproj
View File

@@ -77,6 +77,7 @@
<Compile Include="IUpdateable.cs" />
<Compile Include="LaunchParameters.cs" />
<Compile Include="MessageBox.cs" />
<Compile Include="Display.cs" />
<Compile Include="NamespaceDocs.cs" />
<Compile Include="PlayerIndex.cs" />
<Compile Include="PreparingDeviceSettingsEventArgs.cs" />

32
Libraries/MonoGame.Framework/Src/MonoGame.Framework/SDL/SDLGameWindow.cs
View File

@@ -87,6 +87,22 @@ namespace Microsoft.Xna.Framework
}
}
public override int TargetDisplay
{
get => Sdl.Window.GetDisplayIndex(Handle);
set
{
int maxDisplayIndex = Sdl.Display.GetNumVideoDisplays() - 1;
// if the value is out of range, set it to 0 (the primary display)
if (value > maxDisplayIndex || value < 0) { value = 0; }
if (value == Sdl.Window.GetDisplayIndex(Handle)) { return; }
Sdl.Window.SetPosition(Handle, Sdl.Window.PosCentered | value, Sdl.Window.PosCentered | value);
}
}
public static GameWindow Instance;
public uint? Id;
public bool IsFullScreen;
@@ -163,13 +179,6 @@ namespace Microsoft.Xna.Framework
var winx = Sdl.Window.PosCentered;
var winy = Sdl.Window.PosCentered;
// if we are on Linux, start on the current screen
if (CurrentPlatform.OS == OS.Linux)
{
winx |= GetMouseDisplay();
winy |= GetMouseDisplay();
}
_handle = Sdl.Window.Create(AssemblyHelper.GetDefaultWindowTitle(),
winx, winy, _width, _height, initflags);
@@ -269,11 +278,8 @@ namespace Microsoft.Xna.Framework
OnClientSizeChanged();
int ignore, minx = 0, miny = 0;
Sdl.Window.GetBorderSize(_handle, out miny, out minx, out ignore, out ignore);
var centerX = Math.Max(prevBounds.X + ((prevBounds.Width - clientWidth) / 2), minx);
var centerY = Math.Max(prevBounds.Y + ((prevBounds.Height - clientHeight) / 2), miny);
var centerX = prevBounds.X + ((prevBounds.Width - clientWidth) / 2);
var centerY = prevBounds.Y + ((prevBounds.Height - clientHeight) / 2);
if (IsFullScreen && !_willBeFullScreen)
{
@@ -291,7 +297,7 @@ namespace Microsoft.Xna.Framework
// after the window gets resized, window position information
// becomes wrong (for me it always returned 10 8). Solution is
// to not try and set the window position because it will be wrong.
if ((Sdl.Patch > 4 || !AllowUserResizing) && !_wasMoved)
if (((Sdl.Patch > 4 && Sdl.Minor == 0) || !AllowUserResizing) && !_wasMoved)
Sdl.Window.SetPosition(Handle, centerX, centerY);
Sdl.Window.Show(Handle);