From: numzero <numzer0@yandex.ru>
Date: Fri, 3 Mar 2023 18:52:25 +0000 (+0300)
Subject: Merge branch 'master' into opengl3
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=ceb53be9e3ada7f5e9fdc1262a2612a9ea6fbd8b;p=irrlicht.git

Merge branch 'master' into opengl3
---

ceb53be9e3ada7f5e9fdc1262a2612a9ea6fbd8b
diff --cc source/Irrlicht/CIrrDeviceSDL.cpp
index ecd8a8d,1af434b..b0c7747
--- a/source/Irrlicht/CIrrDeviceSDL.cpp
+++ b/source/Irrlicht/CIrrDeviceSDL.cpp
@@@ -344,16 -344,6 +344,19 @@@ void CIrrDeviceSDL::logAttributes(
  
  bool CIrrDeviceSDL::createWindow()
  {
 +	if (CreationParams.Fullscreen) {
++#ifdef _IRR_EMSCRIPTEN_PLATFORM_
 +		SDL_Flags |= SDL_WINDOW_FULLSCREEN;
- 	} else  {
- 		if (Resizable)
- 			SDL_Flags |= SDL_WINDOW_RESIZABLE;
- 		if (CreationParams.WindowMaximized)
- 			SDL_Flags |= SDL_WINDOW_MAXIMIZED;
++#else
++		SDL_Flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
++#endif
 +	}
++	if (Resizable)
++		SDL_Flags |= SDL_WINDOW_RESIZABLE;
++	if (CreationParams.WindowMaximized)
++		SDL_Flags |= SDL_WINDOW_MAXIMIZED;
 +	SDL_Flags |= SDL_WINDOW_OPENGL;
 +
  #ifdef _IRR_EMSCRIPTEN_PLATFORM_
  	if ( Width != 0 || Height != 0 )
  		emscripten_set_canvas_size( Width, Height);