aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: #1045 XMapWindow doesn't preserve current window position

Browse source
This commit is contained in:
kervala 2010-08-01 09:24:10 +02:00
parent 754b997282
commit 33613b8cec
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -674,6 +674,7 @@ private:
bool _Resizable; bool _Resizable;
uint _Interval; uint _Interval;
sint8 _AntiAliasing; sint8 _AntiAliasing;
bool _WindowVisible;
uint32 _WindowWidth, _WindowHeight; uint32 _WindowWidth, _WindowHeight;
sint32 _WindowX, _WindowY; sint32 _WindowX, _WindowY;

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

@ -493,6 +493,7 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
_win = EmptyWindow; _win = EmptyWindow;
_WindowWidth = _WindowHeight = _WindowX = _WindowY = 0; _WindowWidth = _WindowHeight = _WindowX = _WindowY = 0;
_WindowVisible = false;
_FullScreen = false; _FullScreen = false;
_Resizable = resizeable; _Resizable = resizeable;
_OffScreen = mode.OffScreen; _OffScreen = mode.OffScreen;
@ -1828,6 +1829,8 @@ void CDriverGL::showWindow(bool show)
if (_win == EmptyWindow || !_DestroyWindow) if (_win == EmptyWindow || !_DestroyWindow)
return; return;
_WindowVisible = show;
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
ShowWindow (_win, show ? SW_SHOW:SW_HIDE); ShowWindow (_win, show ? SW_SHOW:SW_HIDE);
#elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE) #elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE)
@ -1838,8 +1841,11 @@ void CDriverGL::showWindow(bool show)
if (show) if (show)
{ {
XMapWindow(_dpy, _win); // XMapWindow(_dpy, _win);
// XMapRaised(_dpy, _win); XMapRaised(_dpy, _win);
// fix window position if windows manager want to impose them
setWindowPos(_WindowX, _WindowY);
} }
else else
{ {