forked from bartvdbraak/blender
* handle WM_MOVE on win32 in GHOST
* change window move/size handling so that getWindowBounds gets x,y for window and getClientBounds gets w,h
This commit is contained in:
parent
1039bc26fb
commit
93058ac3b3
@ -750,6 +750,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
|
||||
* message without calling DefWindowProc.
|
||||
*/
|
||||
event = processWindowEvent(GHOST_kEventWindowSize, window);
|
||||
::ValidateRect(hwnd, NULL);
|
||||
break;
|
||||
case WM_CAPTURECHANGED:
|
||||
window->lostMouseCapture();
|
||||
break;
|
||||
@ -772,6 +774,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
|
||||
* to perform any move or size change processing during the WM_WINDOWPOSCHANGED
|
||||
* message without calling DefWindowProc.
|
||||
*/
|
||||
event = processWindowEvent(GHOST_kEventWindowMove, window);
|
||||
::ValidateRect(hwnd, NULL);
|
||||
break;
|
||||
case WM_ERASEBKGND:
|
||||
/* An application sends the WM_ERASEBKGND message when the window background must be
|
||||
* erased (for example, when a window is resized). The message is sent to prepare an
|
||||
|
@ -255,8 +255,8 @@ void GHOST_WindowCarbon::getClientBounds(GHOST_Rect& bounds) const
|
||||
{
|
||||
Rect rect;
|
||||
GHOST_ASSERT(getValid(), "GHOST_WindowCarbon::getClientBounds(): window invalid")
|
||||
// ::GetPortBounds(m_grafPtr, &rect);
|
||||
::GetWindowBounds(m_windowRef, kWindowContentRgn, &rect);
|
||||
::GetPortBounds(m_grafPtr, &rect);
|
||||
//::GetWindowBounds(m_windowRef, kWindowContentRgn, &rect);
|
||||
|
||||
bounds.m_b = rect.bottom;
|
||||
bounds.m_l = rect.left;
|
||||
|
@ -293,6 +293,7 @@ void GHOST_WindowWin32::getClientBounds(GHOST_Rect& bounds) const
|
||||
{
|
||||
RECT rect;
|
||||
::GetClientRect(m_hWnd, &rect);
|
||||
//::GetWindowRect(m_hWnd, &rect);
|
||||
bounds.m_b = rect.bottom;
|
||||
bounds.m_l = rect.left;
|
||||
bounds.m_r = rect.right;
|
||||
|
@ -371,19 +371,23 @@ int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private)
|
||||
}
|
||||
case GHOST_kEventWindowSize:
|
||||
case GHOST_kEventWindowMove: {
|
||||
GHOST_RectangleHandle client_rect;
|
||||
GHOST_RectangleHandle client_rect, window_rect;
|
||||
int l, t, r, b, scr_w, scr_h;
|
||||
int wl, wt, wr, wb;
|
||||
|
||||
window_rect = GHOST_GetWindowBounds(win->ghostwin);
|
||||
client_rect= GHOST_GetClientBounds(win->ghostwin);
|
||||
GHOST_GetRectangle(client_rect, &l, &t, &r, &b);
|
||||
GHOST_GetRectangle(window_rect, &wl, &wt, &wr, &wb);
|
||||
|
||||
GHOST_DisposeRectangle(client_rect);
|
||||
GHOST_DisposeRectangle(window_rect);
|
||||
|
||||
wm_get_screensize(&scr_w, &scr_h);
|
||||
win->sizex= r-l;
|
||||
win->sizey= b-t;
|
||||
win->posx= l;
|
||||
win->posy= scr_h - t - win->sizey;
|
||||
win->posx= wl;
|
||||
win->posy= scr_h - wt - win->sizey;
|
||||
|
||||
if(type!=GHOST_kEventWindowSize)
|
||||
printf("win move event pos %d %d size %d %d\n", win->posx, win->posy, win->sizex, win->sizey);
|
||||
|
Loading…
Reference in New Issue
Block a user