Fixed: #983 Create setWindowSize private method in OpenGL driver
This commit is contained in:
parent
3d54c720ad
commit
a0747e68c0
2 changed files with 7 additions and 9 deletions
|
@ -287,7 +287,6 @@ public:
|
|||
virtual void disableHardwareVertexArrayAGP();
|
||||
virtual void disableHardwareTextureShader();
|
||||
|
||||
virtual void setWindowSize(uint32 width, uint32 height);
|
||||
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable) throw(EBadDisplay);
|
||||
virtual bool setMode(const GfxMode& mode);
|
||||
virtual bool getModes(std::vector<GfxMode> &modes);
|
||||
|
@ -306,11 +305,7 @@ public:
|
|||
|
||||
virtual nlWindow getDisplay()
|
||||
{
|
||||
#if defined(NL_OS_MAC) && defined(NL_MAC_NATIVE)
|
||||
return NULL;
|
||||
#else
|
||||
return _win;
|
||||
#endif
|
||||
}
|
||||
|
||||
virtual uint32 getAvailableVertexAGPMemory ();
|
||||
|
@ -848,6 +843,9 @@ private:
|
|||
|
||||
bool createWindow(const GfxMode& mode);
|
||||
bool destroyWindow();
|
||||
|
||||
void setWindowSize(uint32 width, uint32 height);
|
||||
|
||||
// Methods to manage screen resolutions
|
||||
bool restoreScreenMode();
|
||||
bool saveScreenMode();
|
||||
|
|
|
@ -1559,10 +1559,10 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
|
|||
if (!_FullScreen)
|
||||
{
|
||||
size_hints.flags = PSize | PMinSize | PMaxSize;
|
||||
size_hints.min_width = mode.Width;
|
||||
size_hints.min_height = mode.Height;
|
||||
size_hints.max_width = mode.Width;
|
||||
size_hints.max_height = mode.Height;
|
||||
size_hints.min_width = width;
|
||||
size_hints.min_height = height;
|
||||
size_hints.max_width = width;
|
||||
size_hints.max_height = height;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue