From 7c23f5dfd94fb6b0e9e5ec8a04d65b5f73df20dd Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 13 Sep 2022 19:43:26 +0200 Subject: [PATCH] include/Spectre/Display/DisplayDescription.h: change Empty to None --- include/Spectre/Display/DisplayDescription.h | 2 +- source/Display/Display.cpp | 2 +- source/Platform/Win32/Win32Display.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Spectre/Display/DisplayDescription.h b/include/Spectre/Display/DisplayDescription.h index 06067e0..0d6539b 100644 --- a/include/Spectre/Display/DisplayDescription.h +++ b/include/Spectre/Display/DisplayDescription.h @@ -9,7 +9,7 @@ namespace sp { namespace DisplayDecorate { enum Type { - Empty = 0, + None = 0, Menu = 1 << 0, Resize = 1 << 1, Close = 1 << 2, diff --git a/source/Display/Display.cpp b/source/Display/Display.cpp index bd13bd6..24ced50 100644 --- a/source/Display/Display.cpp +++ b/source/Display/Display.cpp @@ -114,7 +114,7 @@ void Display::setVideoMode(Mode mode) m_cacheDesc = m_description; } - desc.decoration = DisplayDecorate::Empty; + desc.decoration = DisplayDecorate::None; } else { desc = m_cacheDesc; } diff --git a/source/Platform/Win32/Win32Display.cpp b/source/Platform/Win32/Win32Display.cpp index 887688c..25544e2 100644 --- a/source/Platform/Win32/Win32Display.cpp +++ b/source/Platform/Win32/Win32Display.cpp @@ -251,7 +251,7 @@ DWORD Win32Display::getWin32Flags(unsigned int flags) { DWORD win32_flags = WS_VISIBLE; - if (flags == DisplayDecorate::Empty) { + if (flags == DisplayDecorate::None) { win32_flags |= WS_POPUP; } else { if (flags & DisplayDecorate::Menu) {