[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13061] branches/blender2.5/blender: * handle WM_MOVE on win32 in GHOST
Nathan Letwory
jesterking at letwory.net
Sun Dec 30 18:13:36 CET 2007
Revision: 13061
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13061
Author: jesterking
Date: 2007-12-30 18:13:36 +0100 (Sun, 30 Dec 2007)
Log Message:
-----------
* 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
Modified Paths:
--------------
branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2007-12-30 16:47:38 UTC (rev 13060)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2007-12-30 17:13:36 UTC (rev 13061)
@@ -750,6 +750,8 @@
* message without calling DefWindowProc.
*/
event = processWindowEvent(GHOST_kEventWindowSize, window);
+ ::ValidateRect(hwnd, NULL);
+ break;
case WM_CAPTURECHANGED:
window->lostMouseCapture();
break;
@@ -772,6 +774,9 @@
* 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
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2007-12-30 16:47:38 UTC (rev 13060)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowCarbon.cpp 2007-12-30 17:13:36 UTC (rev 13061)
@@ -255,8 +255,8 @@
{
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;
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2007-12-30 16:47:38 UTC (rev 13060)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2007-12-30 17:13:36 UTC (rev 13061)
@@ -293,6 +293,7 @@
{
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;
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c 2007-12-30 16:47:38 UTC (rev 13060)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c 2007-12-30 17:13:36 UTC (rev 13061)
@@ -184,7 +184,7 @@
inital_state = GHOST_kWindowStateMaximized;
else
inital_state = GHOST_kWindowStateNormal;
-
+
#ifdef __APPLE__
{
extern int macPrefState; /* creator.c */
@@ -371,19 +371,23 @@
}
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);
More information about the Bf-blender-cvs
mailing list