Browse Source

Merge branch 'alpha40_SetVdeoShenanigans' of https://github.com/Azaezel/Torque3D into Preview4_0

Areloch 5 years ago
parent
commit
7ff451ec89

+ 1 - 1
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; }

+ 1 - 1
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);

+ 1 - 1
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

+ 1 - 1
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;

+ 1 - 1
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();

+ 1 - 2
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()

+ 1 - 1
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();