Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
rti 2010-06-13 22:38:39 +02:00
commit 1bfd711681
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/3d/driver/opengl/driver_opengl.h
View file

@ -287,7 +287,6 @@ public:
virtual void disableHardwareVertexArrayAGP(); virtual void disableHardwareVertexArrayAGP();
virtual void disableHardwareTextureShader(); 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 setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable) throw(EBadDisplay);
virtual bool setMode(const GfxMode& mode); virtual bool setMode(const GfxMode& mode);
virtual bool getModes(std::vector<GfxMode> &modes); virtual bool getModes(std::vector<GfxMode> &modes);
@ -306,11 +305,7 @@ public:
virtual nlWindow getDisplay() virtual nlWindow getDisplay()
{ {
#if defined(NL_OS_MAC) && defined(NL_MAC_NATIVE)
return NULL;
#else
return _win; return _win;
#endif
} }
virtual uint32 getAvailableVertexAGPMemory (); virtual uint32 getAvailableVertexAGPMemory ();
@ -848,6 +843,9 @@ private:
bool createWindow(const GfxMode& mode); bool createWindow(const GfxMode& mode);
bool destroyWindow(); bool destroyWindow();
void setWindowSize(uint32 width, uint32 height);
// Methods to manage screen resolutions // Methods to manage screen resolutions
bool restoreScreenMode(); bool restoreScreenMode();
bool saveScreenMode(); bool saveScreenMode();

8
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -1559,10 +1559,10 @@ void CDriverGL::setWindowSize(uint32 width, uint32 height)
if (!_FullScreen) if (!_FullScreen)
{ {
size_hints.flags = PSize | PMinSize | PMaxSize; size_hints.flags = PSize | PMinSize | PMaxSize;
size_hints.min_width = mode.Width; size_hints.min_width = width;
size_hints.min_height = mode.Height; size_hints.min_height = height;
size_hints.max_width = mode.Width; size_hints.max_width = width;
size_hints.max_height = mode.Height; size_hints.max_height = height;
} }
#endif #endif