WinRT: minor function and variable name cleanup
authorDavid Ludwig <dludwig@pobox.com>
Tue, 27 Aug 2013 10:57:55 -0400
changeset 8492 1bcacb98366e
parent 8491 50b0bdce11cd
child 8493 b0e7b54c356c
WinRT: minor function and variable name cleanup
src/core/winrt/SDL_winrtapp.cpp
src/core/winrt/SDL_winrtapp.h
src/video/winrt/SDL_winrtvideo.cpp
--- a/src/core/winrt/SDL_winrtapp.cpp	Tue Aug 27 10:56:10 2013 -0400
+++ b/src/core/winrt/SDL_winrtapp.cpp	Tue Aug 27 10:57:55 2013 -0400
@@ -300,12 +300,12 @@
         // window-resize event as it appeared the SDL window didn't change
         // size, and the Direct3D 11.1 renderer wouldn't resize its swap
         // chain.
-        SDL_DisplayMode newDisplayMode = GetMainDisplayMode();
-        m_sdlVideoDevice->displays[0].current_mode = newDisplayMode;
-        m_sdlVideoDevice->displays[0].desktop_mode = newDisplayMode;
-        m_sdlVideoDevice->displays[0].display_modes[0] = newDisplayMode;
+        SDL_DisplayMode resizedDisplayMode = CalcCurrentDisplayMode();
+        m_sdlVideoDevice->displays[0].current_mode = resizedDisplayMode;
+        m_sdlVideoDevice->displays[0].desktop_mode = resizedDisplayMode;
+        m_sdlVideoDevice->displays[0].display_modes[0] = resizedDisplayMode;
 
-        m_sdlWindowData->sdlWindow->fullscreen_mode = newDisplayMode;
+        m_sdlWindowData->sdlWindow->fullscreen_mode = resizedDisplayMode;
 
         // Send the window-resize event to the rest of SDL, and to apps:
         const int windowWidth = (int) ceil(args->Size.Width);
@@ -469,7 +469,7 @@
     }
 }
 
-SDL_DisplayMode SDL_WinRTApp::GetMainDisplayMode()
+SDL_DisplayMode SDL_WinRTApp::CalcCurrentDisplayMode()
 {
     // Create an empty, zeroed-out display mode:
     SDL_DisplayMode mode;
--- a/src/core/winrt/SDL_winrtapp.h	Tue Aug 27 10:56:10 2013 -0400
+++ b/src/core/winrt/SDL_winrtapp.h	Tue Aug 27 10:57:55 2013 -0400
@@ -16,7 +16,7 @@
 
 internal:
     // SDL-specific methods
-    SDL_DisplayMode GetMainDisplayMode();
+    SDL_DisplayMode CalcCurrentDisplayMode();
     void PumpEvents();
     const SDL_WindowData * GetSDLWindowData() const;
     bool HasSDLWindowData() const;
--- a/src/video/winrt/SDL_winrtvideo.cpp	Tue Aug 27 10:56:10 2013 -0400
+++ b/src/video/winrt/SDL_winrtvideo.cpp	Tue Aug 27 10:57:55 2013 -0400
@@ -134,7 +134,7 @@
 static int
 WINRT_InitModes(_THIS)
 {
-    SDL_DisplayMode mode = SDL_WinRTGlobalApp->GetMainDisplayMode();
+    SDL_DisplayMode mode = SDL_WinRTGlobalApp->CalcCurrentDisplayMode();
     if (SDL_AddBasicVideoDisplay(&mode) < 0) {
         return -1;
     }