about summary refs log tree commit diff
path: root/src/engine/client/graphics_threaded.cpp
diff options
context:
space:
mode:
authorheinrich5991 <heinrich5991@gmail.com>2012-06-27 11:46:11 +0200
committeroy <Tom_Adams@web.de>2013-02-24 17:38:19 +0100
commit7b545f3ed941d45c3a42016b9de667a08f8d4dc6 (patch)
treea7e6c86753d4daa7c81e041b8480a0ff5b7f53de /src/engine/client/graphics_threaded.cpp
parent56ae76f46574506fa2b28fbf2fdf5672ae5866c6 (diff)
downloadzcatch-7b545f3ed941d45c3a42016b9de667a08f8d4dc6.tar.gz
zcatch-7b545f3ed941d45c3a42016b9de667a08f8d4dc6.zip
Added borderless window functionality
	This might become handy for users with multiple monitors,
	might resolve other issues aswell
Diffstat (limited to 'src/engine/client/graphics_threaded.cpp')
-rw-r--r--src/engine/client/graphics_threaded.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp
index 0c99ebf7..f67753fb 100644
--- a/src/engine/client/graphics_threaded.cpp
+++ b/src/engine/client/graphics_threaded.cpp
@@ -712,7 +712,14 @@ void CGraphics_Threaded::QuadsText(float x, float y, float Size, float r, float
 int CGraphics_Threaded::IssueInit()
 {
 	int Flags = 0;
-	if(g_Config.m_GfxFullscreen) Flags |= IGraphicsBackend::INITFLAG_FULLSCREEN;
+	if(g_Config.m_GfxBorderless && g_Config.m_GfxFullscreen)
+	{
+		dbg_msg("gfx", "both borderless and fullscreen activated, disabling borderless");
+		g_Config.m_GfxBorderless = 0;
+	}
+
+	if(g_Config.m_GfxBorderless) Flags |= IGraphicsBackend::INITFLAG_BORDERLESS;
+	else if(g_Config.m_GfxFullscreen) Flags |= IGraphicsBackend::INITFLAG_FULLSCREEN;
 	if(g_Config.m_GfxVsync) Flags |= IGraphicsBackend::INITFLAG_VSYNC;
 	if(g_Config.m_DbgResizable) Flags |= IGraphicsBackend::INITFLAG_RESIZABLE;