From 9b2c1899294e31e6a92a046874b3cd12916eae7a Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Wed, 6 Nov 2019 22:24:12 -0600
Subject: [PATCH] conforms platformWindow<implementations> to use _setVideoMode
 internals so that those are called by

void PlatformWindow::setVideoMode(const GFXVideoMode &mode)
{
   _setVideoMode(mode);
 getScreenResChangeSignal().trigger(this, true);
}

allowing the resize trigger to go off, as well as any other shared functionality we want to slim the per-implementation specs down to later down the line
---
 Engine/source/windowManager/mac/macWindow.h       | 2 +-
 Engine/source/windowManager/mac/macWindow.mm      | 2 +-
 Engine/source/windowManager/platformWindow.h      | 2 +-
 Engine/source/windowManager/sdl/sdlWindow.cpp     | 2 +-
 Engine/source/windowManager/sdl/sdlWindow.h       | 2 +-
 Engine/source/windowManager/win32/win32Window.cpp | 3 +--
 Engine/source/windowManager/win32/win32Window.h   | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Engine/source/windowManager/mac/macWindow.h b/Engine/source/windowManager/mac/macWindow.h
index ebf5c5e7b..a484eb254 100644
--- a/Engine/source/windowManager/mac/macWindow.h
+++ b/Engine/source/windowManager/mac/macWindow.h
@@ -42,7 +42,7 @@ public:
 
    virtual GFXDevice *getGFXDevice() { return mDevice; }
    virtual GFXWindowTarget *getGFXTarget() { return mTarget; }
-   virtual void setVideoMode(const GFXVideoMode &mode);
+   virtual void _setVideoMode(const GFXVideoMode &mode);
    virtual const GFXVideoMode &getVideoMode() { return mCurrentMode; }
    
    virtual WindowId getWindowId() { return mWindowId; }
diff --git a/Engine/source/windowManager/mac/macWindow.mm b/Engine/source/windowManager/mac/macWindow.mm
index db64aac0d..c21cfe159 100644
--- a/Engine/source/windowManager/mac/macWindow.mm
+++ b/Engine/source/windowManager/mac/macWindow.mm
@@ -259,7 +259,7 @@ void MacWindow::_disassociateCocoaWindow()
    mCocoaWindow = NULL;
 }
 
-void MacWindow::setVideoMode(const GFXVideoMode &mode)
+void MacWindow::_setVideoMode(const GFXVideoMode &mode)
 {
    mCurrentMode = mode;
    setSize(mCurrentMode.resolution);
diff --git a/Engine/source/windowManager/platformWindow.h b/Engine/source/windowManager/platformWindow.h
index df1b51595..5c98d2ffd 100644
--- a/Engine/source/windowManager/platformWindow.h
+++ b/Engine/source/windowManager/platformWindow.h
@@ -511,7 +511,7 @@ public:
    virtual void* getPlatformDrawable() const = 0;
 protected:
    virtual void _setFullscreen(const bool fullScreen) {};
-   virtual void _setVideoMode(const GFXVideoMode &mode) {};
+   virtual void _setVideoMode(const GFXVideoMode &mode) = 0;
 };
 
 #endif
diff --git a/Engine/source/windowManager/sdl/sdlWindow.cpp b/Engine/source/windowManager/sdl/sdlWindow.cpp
index dbf182955..2afd2054b 100644
--- a/Engine/source/windowManager/sdl/sdlWindow.cpp
+++ b/Engine/source/windowManager/sdl/sdlWindow.cpp
@@ -156,7 +156,7 @@ void* PlatformWindowSDL::getSystemWindow(const WindowSystem system)
     return NULL;
 }
 
-void PlatformWindowSDL::setVideoMode( const GFXVideoMode &mode )
+void PlatformWindowSDL::_setVideoMode( const GFXVideoMode &mode )
 {
    mVideoMode = mode;
    mSuppressReset = true;
diff --git a/Engine/source/windowManager/sdl/sdlWindow.h b/Engine/source/windowManager/sdl/sdlWindow.h
index eb73f39bd..cbc1b8cdf 100644
--- a/Engine/source/windowManager/sdl/sdlWindow.h
+++ b/Engine/source/windowManager/sdl/sdlWindow.h
@@ -115,7 +115,7 @@ public:
    virtual GFXDevice *getGFXDevice();
    virtual GFXWindowTarget *getGFXTarget();
    
-   virtual void setVideoMode(const GFXVideoMode &mode);
+   virtual void _setVideoMode(const GFXVideoMode &mode);
    virtual const GFXVideoMode &getVideoMode();
    virtual bool clearFullscreen();
    virtual bool isFullscreen();
diff --git a/Engine/source/windowManager/win32/win32Window.cpp b/Engine/source/windowManager/win32/win32Window.cpp
index 21a0597d9..1db5f7919 100644
--- a/Engine/source/windowManager/win32/win32Window.cpp
+++ b/Engine/source/windowManager/win32/win32Window.cpp
@@ -143,7 +143,7 @@ const GFXVideoMode & Win32Window::getVideoMode()
 	return mVideoMode;
 }
 
-void Win32Window::setVideoMode( const GFXVideoMode &mode )
+void Win32Window::_setVideoMode( const GFXVideoMode &mode )
 {
    bool needCurtain = ( mVideoMode.fullScreen != mode.fullScreen );
 
@@ -277,7 +277,6 @@ void Win32Window::setVideoMode( const GFXVideoMode &mode )
       mOwningManager->raiseCurtain();
 
    SetForegroundWindow( getHWND() );
-   resizeEvent.trigger( this, true );
 }
 
 bool Win32Window::clearFullscreen()
diff --git a/Engine/source/windowManager/win32/win32Window.h b/Engine/source/windowManager/win32/win32Window.h
index 0262917b7..638cc3b19 100644
--- a/Engine/source/windowManager/win32/win32Window.h
+++ b/Engine/source/windowManager/win32/win32Window.h
@@ -164,7 +164,7 @@ public:
    virtual GFXDevice *getGFXDevice();
    virtual GFXWindowTarget *getGFXTarget();
    
-   virtual void setVideoMode(const GFXVideoMode &mode);
+   virtual void _setVideoMode(const GFXVideoMode &mode);
    virtual const GFXVideoMode &getVideoMode();
    virtual bool clearFullscreen();
    virtual bool isFullscreen();