Skip to content

Commit

Permalink
Renamed some things & SavePosition default true
Browse files Browse the repository at this point in the history
  • Loading branch information
flamewave000 committed Mar 9, 2024
1 parent e764d5c commit cffa3a8
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 42 deletions.
2 changes: 1 addition & 1 deletion Constants.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

using System.Drawing;

namespace DirectXHost
namespace DiscordOverlay
{
public static class Constants
{
Expand Down
25 changes: 0 additions & 25 deletions DirectXHost.sln

This file was deleted.

8 changes: 4 additions & 4 deletions DirectXHost.cs → DiscordOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Linq;
using DirectXHost.Extensions;
using DiscordOverlay.Extensions;
using System.Threading;
using System.Reflection;
using System.ComponentModel;
using System.Diagnostics;
using System.Timers;

namespace DirectXHost
namespace DiscordOverlay
{
public class DirectXHost : IDisposable
public class DiscordOverlay : IDisposable
{
public const int GWL_EXSTYLE = -20;
public const int WS_EX_TOOLWINDOW = 0x00000080;
Expand Down Expand Up @@ -500,7 +500,7 @@ protected virtual void Dispose(bool disposing)
}

// TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
~DirectXHost()
~DiscordOverlay()
{
// Do not change this code. Put cleanup code in Dispose(bool disposing) above.
Dispose(false);
Expand Down
6 changes: 3 additions & 3 deletions DirectXHost.csproj → DiscordOverlay.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{A2948F55-87D4-4512-8805-E12EF75C8B45}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DirectXHost</RootNamespace>
<RootNamespace>DiscordOverlay</RootNamespace>
<AssemblyName>Discord Overlay</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -49,7 +49,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>DirectXHost.Program</StartupObject>
<StartupObject>DiscordOverlay.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\App.ico</ApplicationIcon>
Expand Down Expand Up @@ -91,7 +91,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Constants.cs" />
<Compile Include="DirectXHost.cs" />
<Compile Include="DiscordOverlay.cs" />
<Compile Include="Extensions\Direct2DExt.cs" />
<Compile Include="GraphicsD3D11.cs" />
<Compile Include="Program.cs" />
Expand Down
43 changes: 43 additions & 0 deletions DiscordOverlay.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32616.157
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordOverlay", "DiscordOverlay.csproj", "{A2948F55-87D4-4512-8805-E12EF75C8B45}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|ARM64.Build.0 = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|x64.ActiveCfg = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|x64.Build.0 = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|x86.ActiveCfg = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Debug|x86.Build.0 = Debug|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|Any CPU.Build.0 = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|ARM64.ActiveCfg = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|ARM64.Build.0 = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|x64.ActiveCfg = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|x64.Build.0 = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|x86.ActiveCfg = Release|Any CPU
{A2948F55-87D4-4512-8805-E12EF75C8B45}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6674BC6A-F0A5-4275-9A09-BFF4B6C8E729}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Extensions/Direct2DExt.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Drawing.Imaging;
using System.Runtime.InteropServices;

namespace DirectXHost.Extensions
namespace DiscordOverlay.Extensions
{
public static class Direct2DExt
{
Expand Down
2 changes: 1 addition & 1 deletion GraphicsD3D11.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using D3D11Device = SharpDX.Direct3D11.Device;
using D2D = SharpDX.Direct2D1;

namespace DirectXHost
namespace DiscordOverlay
{
internal class GraphicsD3D11 : IDisposable
{
Expand Down
4 changes: 2 additions & 2 deletions Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace DirectXHost
namespace DiscordOverlay
{
static class Program
{
Expand All @@ -10,7 +10,7 @@ static class Program
[STAThread]
static void Main()
{
DirectXHost dxHost = new DirectXHost();
DiscordOverlay dxHost = new DiscordOverlay();
dxHost.Run().Wait();
}
}
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.1.0")]
[assembly: AssemblyFileVersion("2.3.1.0")]
[assembly: AssemblyVersion("2.3.0.0")]
[assembly: AssemblyFileVersion("2.3.0.0")]
[assembly: NeutralResourcesLanguage("en-CA")]
4 changes: 2 additions & 2 deletions Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using System.Runtime.Serialization.Json;
using System.Runtime.Serialization;

namespace DirectXHost
namespace DiscordOverlay
{
static class Settings
{
Expand Down Expand Up @@ -137,7 +137,7 @@ public static async Task Load() => await Task.Run(() =>
data = new JsonData
{
overlayClickable = true,
savePositions = false,
savePositions = true,
topMost = true,
overlayRect = new Rect { Size = new Size(Constants.OverlayStartWidth, Constants.OverlayStartHeight), Point = Point.Empty },
containerRect = new Rect { Size = new Size(Constants.StartWidth, Constants.StartHeight), Point = Point.Empty },
Expand Down
2 changes: 1 addition & 1 deletion UnclickableLabel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Drawing;
using System.Windows.Forms;

namespace DirectXHost
namespace DiscordOverlay
{
internal class UnclickableLabel : Label
{
Expand Down

0 comments on commit cffa3a8

Please sign in to comment.