From 12b2413e232dea129109c94d4b40abffa90280a9 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 23 Dec 2020 14:34:12 +0100 Subject: [PATCH] include/Spectre/Display/DisplayDescription.h: Rename DisplayDecorate::None to Empty (None clashes with X11) --- include/Spectre/Display/DisplayDescription.h | 2 +- source/Display/Display.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Spectre/Display/DisplayDescription.h b/include/Spectre/Display/DisplayDescription.h index 0d6539b..06067e0 100644 --- 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, diff --git a/source/Display/Display.cpp b/source/Display/Display.cpp index 24ced50..bd13bd6 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::None; + desc.decoration = DisplayDecorate::Empty; } else { desc = m_cacheDesc; }