Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1467 from dumganhar/gles20 

Fix a bug about calculating client area on win32.
This commit is contained in:
James Chen 2012-10-17 01:53:45 -07:00
parent 7f97041b49 9f7019e48c
commit cfb1f11d44
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos2dx/platform/win32/CCEGLView.cpp
View File

@ -302,8 +302,9 @@ bool CCEGLView::Create()
wszBuf, // Window Title
WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX, // Defined Window Style
0, 0, // Window Position
100, // Window Width
100, // Window Height
//TODO: Initializing width with a large value to avoid getting a wrong client area by 'GetClientRect' function.
1000, // Window Width
1000, // Window Height
NULL, // No Parent Window
NULL, // No Menu
hInstance, // Instance
@ -582,6 +583,11 @@ void CCEGLView::setIMEKeyboardState(bool /*bOpen*/)
void CCEGLView::setMenuResource(LPCWSTR menu)
{
m_menu = menu;
if (m_hWnd != NULL)
{
HMENU hMenu = LoadMenu(GetModuleHandle(NULL), menu);
SetMenu(m_hWnd, hMenu);
}
}
void CCEGLView::setWndProc(CUSTOM_WND_PROC proc)
@ -631,7 +637,7 @@ void CCEGLView::resize(int width, int height)
#endif
}
AdjustWindowRectEx(&rcClient, GetWindowLong(m_hWnd, GWL_STYLE), false, GetWindowLong(m_hWnd, GWL_EXSTYLE));
AdjustWindowRectEx(&rcClient, GetWindowLong(m_hWnd, GWL_STYLE), FALSE, GetWindowLong(m_hWnd, GWL_EXSTYLE));
// change width and height
SetWindowPos(m_hWnd, 0, 0, 0, width + ptDiff.x, height + ptDiff.y,