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

Borderless windowed mode, mid-round settings menu

Browse Source
This commit is contained in:
Regalis
2016-04-22 20:55:56 +03:00
parent 3347fcdd20
commit e84e72bba6
8 changed files with 111 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Launcher2/Launcher.csproj
+5
View File
@@ -14,6 +14,8 @@
<MonoGamePlatform>Windows</MonoGamePlatform>
<MonoGameContentBuilderExe>
</MonoGameContentBuilderExe>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -24,6 +26,7 @@
<DefineConstants>DEBUG;TRACE;WINDOWS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -33,6 +36,7 @@
<DefineConstants>TRACE;WINDOWS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Icon.ico</ApplicationIcon>
@@ -68,6 +72,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Launcher2/LauncherMain.cs
+24 -14
View File
@@ -31,7 +31,7 @@ namespace Launcher2
private List<DisplayMode> supportedModes;
private GUIDropDown resolutionDD, contentPackageDD;
private GUIDropDown resolutionDD, contentPackageDD, displayModeDD;
private GUITextBlock updateInfoText;
private GUIListBox updateInfoBox;
@@ -40,11 +40,11 @@ namespace Launcher2
GUIButton launchButton;
public bool FullScreenEnabled
{
get { return settings.FullScreenEnabled; }
set { settings.FullScreenEnabled = value; }
}
//public bool FullScreenEnabled
//{
// get { return settings.FullScreenEnabled; }
// set { settings.FullScreenEnabled = value; }
//}
public bool AutoCheckUpdates
{
@@ -160,9 +160,19 @@ namespace Launcher2
//new GUIButton(new Rectangle(x,y+120,150,20), "Package Manager", GUI.Style, guiRoot);
var fullScreenTick = new GUITickBox(new Rectangle(x,y+150,20,20), "Fullscreen", Alignment.TopLeft, guiRoot);
fullScreenTick.OnSelected = ToggleFullScreen;
fullScreenTick.Selected = settings.FullScreenEnabled;
new GUITextBlock(new Rectangle(x, y + 130, 20, 20), "Display mode", GUI.Style, Alignment.TopLeft, Alignment.TopLeft, guiRoot);
displayModeDD = new GUIDropDown(new Rectangle(x, y + 150, 200, 20), "", GUI.Style, guiRoot);
displayModeDD.AddItem("Fullscreen", WindowMode.Fullscreen);
displayModeDD.AddItem("Windowed", WindowMode.Windowed);
displayModeDD.AddItem("Borderless windowed", WindowMode.BorderlessWindowed);
displayModeDD.SelectItem(settings.WindowMode);
displayModeDD.OnSelected = (guiComponent) => { settings.WindowMode = (WindowMode)guiComponent.UserData; return true; };
//var fullScreenTick = new GUITickBox(new Rectangle(x,y+150,20,20), "Fullscreen", Alignment.TopLeft, guiRoot);
//fullScreenTick.OnSelected = ToggleFullScreen;
//fullScreenTick.Selected = settings.FullScreenEnabled;
if (settings.AutoCheckUpdates)
{
@@ -243,11 +253,11 @@ namespace Launcher2
return true;
}
private bool ToggleFullScreen(GUITickBox tickBox)
{
settings.FullScreenEnabled = !settings.FullScreenEnabled;
return true;
}
//private bool ToggleFullScreen(GUITickBox tickBox)
//{
// settings.FullScreenEnabled = !settings.FullScreenEnabled;
// return true;
//}
private bool LaunchClick(GUIButton button, object obj)
{