TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

adjust debug check

Browse Source
This commit is contained in:
cxgeorge 2002-04-11 23:51:24 +00:00
parent 49883efe2e
commit 44cf5899d3
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
View File

@ -802,7 +802,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
// windowed apps currently run regardless of if its window is in the foreground // windowed apps currently run regardless of if its window is in the foreground
// so we cannot rely on window messages to reawaken app // so we cannot rely on window messages to reawaken app
if((wparam==_PandaPausedTimer) && (!_window_active||_active_minimized_fullscreen)) { if((wparam==_PandaPausedTimer) && ((!_window_active)||_active_minimized_fullscreen)) {
assert(_dxgsg!=NULL); assert(_dxgsg!=NULL);
_dxgsg->CheckCooperativeLevel(DO_REACTIVATE_WINDOW); _dxgsg->CheckCooperativeLevel(DO_REACTIVATE_WINDOW);
@ -968,7 +968,7 @@ void wdxGraphicsWindow::deactivate_window(void) {
// current policy is to suspend minimized or deactivated fullscreen windows, but leave // current policy is to suspend minimized or deactivated fullscreen windows, but leave
// regular windows running normally // regular windows running normally
if(!_window_active || _exiting_window || _active_minimized_fullscreen) { if((!_window_active) || _exiting_window || _active_minimized_fullscreen) {
#ifdef _DEBUG #ifdef _DEBUG
if(wdxdisplay_cat.is_spam()) if(wdxdisplay_cat.is_spam())
wdxdisplay_cat.spam() << "deactivate_window called, but ignored in current mode\n"; wdxdisplay_cat.spam() << "deactivate_window called, but ignored in current mode\n";
@ -2546,21 +2546,33 @@ void wdxGraphicsWindow::init_resized_window(void) {
if(pDisplay->PresParams.Windowed) { if(pDisplay->PresParams.Windowed) {
POINT ul,lr; POINT ul,lr;
RECT view_rect; RECT client_rect;
// need to figure out x,y origin offset of window (we already know the client area size) // need to figure out x,y origin offset of window client area on screen
GetClientRect( pDisplay->hWnd, &view_rect ); // (we already know the client area size)
ul.x=view_rect.left; ul.y=view_rect.top;
lr.x=view_rect.right; lr.y=view_rect.bottom; GetClientRect(pDisplay->hWnd, &client_rect);
ul.x=client_rect.left; ul.y=client_rect.top;
lr.x=client_rect.right; lr.y=client_rect.bottom;
ClientToScreen(pDisplay->hWnd, &ul); ClientToScreen(pDisplay->hWnd, &ul);
ClientToScreen(pDisplay->hWnd, &lr); ClientToScreen(pDisplay->hWnd, &lr);
view_rect.left=ul.x; view_rect.top=ul.y; client_rect.left=ul.x; client_rect.top=ul.y;
view_rect.right=lr.x; view_rect.bottom=lr.y; client_rect.right=lr.x; client_rect.bottom=lr.y;
_props._xorg = view_rect.left; // _props should reflect view rectangle _props._xorg = client_rect.left; // _props should reflect view rectangle
_props._yorg = view_rect.top; _props._yorg = client_rect.top;
// make sure GDI and DX agree on window client area size #ifdef _DEBUG
assert((RECT_XSIZE(view_rect)==newWidth)&&(RECT_YSIZE(view_rect)==newHeight)); // try to make sure GDI and DX agree on window client area size
// but client rect will not include any offscreen areas, so dont
// do check if window was bigger than screen (there are other bad
// cases too, like when window is positioned partly offscreen,
// or if window trim border make size bigger than screen)
RECT desktop_rect;
GetClientRect(GetDesktopWindow(), &desktop_rect);
if((_props._xsize<RECT_XSIZE(desktop_rect)) && (_props._ysize<RECT_YSIZE(desktop_rect)))
assert((RECT_XSIZE(client_rect)==newWidth)&&(RECT_YSIZE(client_rect)==newHeight));
#endif
} }
resized(newWidth,newHeight); // update panda channel/display rgn info, _props.xsize, _props.ysize resized(newWidth,newHeight); // update panda channel/display rgn info, _props.xsize, _props.ysize
@ -2775,7 +2787,7 @@ void INLINE wdxGraphicsWindow::process_events(void) {
// Get 1 msg at a time until no more are left and we block and sleep, // Get 1 msg at a time until no more are left and we block and sleep,
// or message changes _return_control_to_app or _window_active status // or message changes _return_control_to_app or _window_active status
while(!_window_active && (!_return_control_to_app)) { while((!_window_active) && (!_return_control_to_app)) {
process_1_event(); process_1_event();
} }
_return_control_to_app = false; _return_control_to_app = false;