Browse Source

Merge branch 'master' of github.com:bkaradzic/bgfx

Branimir Karadžić 10 years ago
parent
commit
bd9cd80cc0
2 changed files with 7 additions and 1 deletions
  1. 2 1
      examples/common/entry/entry_sdl.cpp
  2. 5 0
      examples/common/entry/entry_windows.cpp

+ 2 - 1
examples/common/entry/entry_sdl.cpp

@@ -192,7 +192,7 @@ namespace entry
 		union { void* p; WindowHandle h; } cast;
 		cast.h = _handle;
 		uev.data1 = cast.p;
-		
+
 		uev.data2 = _msg;
 		uev.code = _code;
 		SDL_PushEvent(&event);
@@ -619,6 +619,7 @@ namespace entry
 
 							case SDL_USER_WINDOW_TOGGLE_FULL_SCREEN:
 								{
+									WindowHandle handle = getWindowHandle(uev);
 									m_fullscreen = !m_fullscreen;
 									SDL_SetWindowFullscreen(m_window[handle.idx], m_fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0);
 								}

+ 5 - 0
examples/common/entry/entry_windows.cpp

@@ -1067,6 +1067,11 @@ namespace entry
 		PostMessage(s_ctx.m_hwnd[0], WM_USER_WINDOW_TOGGLE_FRAME, _handle.idx, 0);
 	}
 
+	void toggleFullscreen(WindowHandle _handle)
+	{
+		BX_UNUSED(_handle);
+	}
+
 	void setMouseLock(WindowHandle _handle, bool _lock)
 	{
 		PostMessage(s_ctx.m_hwnd[0], WM_USER_WINDOW_MOUSE_LOCK, _handle.idx, _lock);