pnx/spectre
1
0
Fork 0
Code Releases 2 Activity

Revert "include/Spectre/Display/DisplayDescription.h: change Empty to None"

Browse source 
This reverts commit 7c23f5dfd9.

`None` is defined in X11.
This commit is contained in:
Henrik Hautakoski 2022-09-30 23:35:36 +02:00
parent 6007f52194
commit f2fc9d46b8
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Spectre/Display/DisplayDescription.h
View file

@ -9,7 +9,7 @@ namespace sp {
namespace DisplayDecorate { namespace DisplayDecorate {
enum Type { enum Type {
None = 0, Empty = 0,
Menu = 1 << 0, Menu = 1 << 0,
Resize = 1 << 1, Resize = 1 << 1,
Close = 1 << 2, Close = 1 << 2,

2
source/Display/Display.cpp
View file

@ -118,7 +118,7 @@ void Display::setVideoMode(Mode mode)
// Windowed fullscreen. // Windowed fullscreen.
else if (mode == WINDOWEDFULLSCREEN) { else if (mode == WINDOWEDFULLSCREEN) {
DisplayMode desktop = DisplayMode::getDesktopMode(); DisplayMode desktop = DisplayMode::getDesktopMode();
m_impl->setDecoration(DisplayDecorate::None); m_impl->setDecoration(DisplayDecorate::Empty);
m_impl->setSize(desktop.width, desktop.height); m_impl->setSize(desktop.width, desktop.height);
m_impl->setPosition(0, 0); m_impl->setPosition(0, 0);
} }

2
source/Platform/Win32/Win32Display.cpp
View file

@ -258,7 +258,7 @@ DWORD Win32Display::getWin32Flags(unsigned int flags)
{ {
DWORD win32_flags = WS_VISIBLE; DWORD win32_flags = WS_VISIBLE;
if (flags == DisplayDecorate::None) { if (flags == DisplayDecorate::Empty) {
win32_flags |= WS_POPUP; win32_flags |= WS_POPUP;
} else { } else {
if (flags & DisplayDecorate::Menu) { if (flags & DisplayDecorate::Menu) {