diff --git a/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj b/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj
index 70dee33..997e50b 100644
--- a/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj
+++ b/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj
@@ -6,8 +6,4 @@
enable
-
-
-
-
diff --git a/Dashboard.OpenTK/PAL2/PhysicalWindow.cs b/Dashboard.OpenTK/PAL2/PhysicalWindow.cs
index 822528d..f4aaf6c 100644
--- a/Dashboard.OpenTK/PAL2/PhysicalWindow.cs
+++ b/Dashboard.OpenTK/PAL2/PhysicalWindow.cs
@@ -2,7 +2,6 @@
using System.Drawing;
using System.Net;
using System.Runtime.CompilerServices;
-using Dashboard.Drawing;
using Dashboard.Events;
using Dashboard.OpenGL;
using Dashboard.Pal;
diff --git a/Dashboard.sln b/Dashboard.sln
index 4e23c84..52bb0d4 100644
--- a/Dashboard.sln
+++ b/Dashboard.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dashboard", "Dashboard\Dashboard.csproj", "{49A62F46-AC1C-4240-8615-020D4FBBF964}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dashboard.Drawing", "Dashboard.Drawing\Dashboard.Drawing.csproj", "{1BDFEF50-C907-42C8-B63B-E4F6F585CFB5}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9D6CCC74-4DF3-47CB-B9B2-6BB75DF2BC40}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dashboard.TestApplication", "tests\Dashboard.TestApplication\Dashboard.TestApplication.csproj", "{7C90B90B-DF31-439B-9080-CD805383B014}"
@@ -17,10 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dashboard.TestApplication",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.Common", "Dashboard.Common\Dashboard.Common.csproj", "{C77CDD2B-2482-45F9-B330-47A52F5F13C0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.Drawing.OpenGL", "Dashboard.Drawing.OpenGL\Dashboard.Drawing.OpenGL.csproj", "{454198BA-CB95-41C5-A934-B1C8FDA35A6B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.ImmediateUI", "Dashboard.ImmediateUI\Dashboard.ImmediateUI.csproj", "{3F33197F-0B7B-4CD8-98BD-05D6D5EC76B2}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frameworks", "Frameworks", "{9B62A92D-ABF5-4704-B831-FD075515A82F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dashboard.OpenTK", "Dashboard.OpenTK\Dashboard.OpenTK.csproj", "{7B064228-2629-486E-95C6-BDDD4B4602C4}"
@@ -43,10 +37,6 @@ Global
{49A62F46-AC1C-4240-8615-020D4FBBF964}.Debug|Any CPU.Build.0 = Debug|Any CPU
{49A62F46-AC1C-4240-8615-020D4FBBF964}.Release|Any CPU.ActiveCfg = Release|Any CPU
{49A62F46-AC1C-4240-8615-020D4FBBF964}.Release|Any CPU.Build.0 = Release|Any CPU
- {1BDFEF50-C907-42C8-B63B-E4F6F585CFB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1BDFEF50-C907-42C8-B63B-E4F6F585CFB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1BDFEF50-C907-42C8-B63B-E4F6F585CFB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1BDFEF50-C907-42C8-B63B-E4F6F585CFB5}.Release|Any CPU.Build.0 = Release|Any CPU
{7C90B90B-DF31-439B-9080-CD805383B014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C90B90B-DF31-439B-9080-CD805383B014}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C90B90B-DF31-439B-9080-CD805383B014}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,14 +45,6 @@ Global
{C77CDD2B-2482-45F9-B330-47A52F5F13C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C77CDD2B-2482-45F9-B330-47A52F5F13C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C77CDD2B-2482-45F9-B330-47A52F5F13C0}.Release|Any CPU.Build.0 = Release|Any CPU
- {454198BA-CB95-41C5-A934-B1C8FDA35A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {454198BA-CB95-41C5-A934-B1C8FDA35A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {454198BA-CB95-41C5-A934-B1C8FDA35A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {454198BA-CB95-41C5-A934-B1C8FDA35A6B}.Release|Any CPU.Build.0 = Release|Any CPU
- {3F33197F-0B7B-4CD8-98BD-05D6D5EC76B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3F33197F-0B7B-4CD8-98BD-05D6D5EC76B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3F33197F-0B7B-4CD8-98BD-05D6D5EC76B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3F33197F-0B7B-4CD8-98BD-05D6D5EC76B2}.Release|Any CPU.Build.0 = Release|Any CPU
{7B064228-2629-486E-95C6-BDDD4B4602C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B064228-2629-486E-95C6-BDDD4B4602C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B064228-2629-486E-95C6-BDDD4B4602C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Dashboard/Controls/Control.cs b/Dashboard/Controls/Control.cs
index 54c738d..1d32da4 100644
--- a/Dashboard/Controls/Control.cs
+++ b/Dashboard/Controls/Control.cs
@@ -1,5 +1,4 @@
using System;
-using Dashboard.Drawing;
using Dashboard.Events;
using Dashboard.Pal;
using Dashboard.Windowing;
diff --git a/Dashboard/Controls/Label.cs b/Dashboard/Controls/Label.cs
index 93cba80..a0f7a60 100644
--- a/Dashboard/Controls/Label.cs
+++ b/Dashboard/Controls/Label.cs
@@ -13,7 +13,7 @@ namespace Dashboard.Controls
public event EventHandler? TextChanged;
- protected IBrush TextBrush => throw new NotImplementedException();
+ // protected IBrush TextBrush => throw new NotImplementedException();
protected IFont Font => throw new NotImplementedException();
protected virtual void OnTextChanged(string oldValue, string newValue)
@@ -24,8 +24,8 @@ namespace Dashboard.Controls
protected void CalculateSize()
{
- SizeF sz = Typesetter.MeasureString(Font, Text);
- ClientArea = new Box2d(ClientArea.Min, ClientArea.Min + (Vector2)sz);
+ // SizeF sz = Typesetter.MeasureString(Font, Text);
+ // ClientArea = new Box2d(ClientArea.Min, ClientArea.Min + (Vector2)sz);
}
}
}
diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj
index 95aa9e2..a44e056 100644
--- a/Dashboard/Dashboard.csproj
+++ b/Dashboard/Dashboard.csproj
@@ -8,7 +8,6 @@
-
diff --git a/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj b/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj
index 019f94e..f3f598e 100644
--- a/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj
+++ b/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj
@@ -10,9 +10,6 @@
-
-
-
diff --git a/tests/Dashboard.TestApplication/Program.cs b/tests/Dashboard.TestApplication/Program.cs
index 756945e..bba31d7 100644
--- a/tests/Dashboard.TestApplication/Program.cs
+++ b/tests/Dashboard.TestApplication/Program.cs
@@ -52,8 +52,6 @@ Application app = new Pal2Application()
};
PhysicalWindow window;
-SolidBrush fg = new SolidBrush(Color.FromArgb(0, 0, 0, 0));
-SolidBrush bg = new SolidBrush(Color.Black);
CancellationTokenSource source = new CancellationTokenSource();
// GLEngine engine;
// ContextExecutor executor;