Merge branch '4-linux-support' into dev

2020-12-28 18:43:22 +01:00 · 2020-12-28 18:43:22 +01:00 · 0e2a3525e4
commit 0e2a3525e4
parent 7e79663dce a172fbb323
36 changed files with 2754 additions and 34 deletions
--- a/include/Spectre/Display/DisplayDescription.h
+++ b/include/Spectre/Display/DisplayDescription.h
@ -9,7 +9,7 @@ namespace sp {
 namespace DisplayDecorate {

 	enum Type {
-		None		= 0,
+		Empty		= 0,
 		Menu		= 1 << 0,
 		Resize		= 1 << 1,
 		Close		= 1 << 2,