WinRT: minor function and variable name cleanup

libsdl-org · Aug 27, 2013 · 80abfc4 · 80abfc4
1 parent 065b2cf
commit 80abfc4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/core/winrt/SDL_winrtapp.cpp b/src/core/winrt/SDL_winrtapp.cpp
@@ -300,12 +300,12 @@ void SDL_WinRTApp::OnWindowSizeChanged(CoreWindow^ sender, WindowSizeChangedEven
         // 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 @@ void SDL_WinRTApp::OnResuming(Platform::Object^ sender, Platform::Object^ args)
     }
 }
 
-SDL_DisplayMode SDL_WinRTApp::GetMainDisplayMode()
+SDL_DisplayMode SDL_WinRTApp::CalcCurrentDisplayMode()
 {
     // Create an empty, zeroed-out display mode:
     SDL_DisplayMode mode;

diff --git a/src/core/winrt/SDL_winrtapp.h b/src/core/winrt/SDL_winrtapp.h
@@ -16,7 +16,7 @@ ref class SDL_WinRTApp sealed : public Windows::ApplicationModel::Core::IFramewo
 
 internal:
     // SDL-specific methods
-    SDL_DisplayMode GetMainDisplayMode();
+    SDL_DisplayMode CalcCurrentDisplayMode();
     void PumpEvents();
     const SDL_WindowData * GetSDLWindowData() const;
     bool HasSDLWindowData() const;

diff --git a/src/video/winrt/SDL_winrtvideo.cpp b/src/video/winrt/SDL_winrtvideo.cpp
@@ -134,7 +134,7 @@ WINRT_VideoInit(_THIS)
 static int
 WINRT_InitModes(_THIS)
 {
-    SDL_DisplayMode mode = SDL_WinRTGlobalApp->GetMainDisplayMode();
+    SDL_DisplayMode mode = SDL_WinRTGlobalApp->CalcCurrentDisplayMode();
     if (SDL_AddBasicVideoDisplay(&mode) < 0) {
         return -1;
     }