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

fix windowed resize

Browse Source
This commit is contained in:
cxgeorge 2002-04-03 00:41:07 +00:00
parent 4cade76e34
commit 89da9042b6
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1143,6 +1143,9 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
pWindowClassName= (dx_use_dx_cursor ? WDX_WINDOWCLASSNAME_NOCURSOR : WDX_WINDOWCLASSNAME); pWindowClassName= (dx_use_dx_cursor ? WDX_WINDOWCLASSNAME_NOCURSOR : WDX_WINDOWCLASSNAME);
} else { } else {
// specify client area, use adjustwindowrect to figure out size of final window to
// pass to CreateWin
RECT win_rect; RECT win_rect;
SetRect(&win_rect, props->_xorg, props->_yorg, props->_xorg + props->_xsize, SetRect(&win_rect, props->_xorg, props->_yorg, props->_xorg + props->_xsize,
props->_yorg + props->_ysize); props->_yorg + props->_ysize);
@ -1150,7 +1153,7 @@ void wdxGraphicsWindowGroup::CreateWindows(void) {
if(props->_border) if(props->_border)
final_window_style |= WS_OVERLAPPEDWINDOW; // should we just use WS_THICKFRAME instead? final_window_style |= WS_OVERLAPPEDWINDOW; // should we just use WS_THICKFRAME instead?
AdjustWindowRect(&win_rect, final_window_style, FALSE); //compute window size based on desired client area size AdjustWindowRect(&win_rect, final_window_style, false); //compute window size based on desired client area size
// make sure origin is on screen // make sure origin is on screen
if(win_rect.left < 0) { if(win_rect.left < 0) {
@ -1352,12 +1355,35 @@ HRESULT WINAPI EnumDisplayModesCallBack(LPDDSURFACEDESC2 lpDDSurfaceDesc,LPVOID
bool wdxGraphicsWindow::resize(unsigned int xsize,unsigned int ysize) { bool wdxGraphicsWindow::resize(unsigned int xsize,unsigned int ysize) {
bool bResizeSucceeded=false; bool bResizeSucceeded=false;
if((xsize==_props._xsize)&&(ysize==_props._ysize)) {
if(wdxdisplay_cat.is_debug())
wdxdisplay_cat.debug() << "redundant resize() called, returning\n";
return true;
}
if(!_props._fullscreen) { if(!_props._fullscreen) {
if(wdxdisplay_cat.is_debug()) if(wdxdisplay_cat.is_debug())
wdxdisplay_cat.debug() << "resize("<<xsize<<","<<ysize<<") called\n"; wdxdisplay_cat.debug() << "resize("<<xsize<<","<<ysize<<") called\n";
// is this enough? // need to figure out actual window size based on props client area rect size
SetWindowPos(_dxgsg->scrn.hWnd, NULL, 0,0, xsize, ysize, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSENDCHANGING); RECT win_rect;
SetRect(&win_rect, _props._xorg, _props._yorg, _props._xorg+xsize, _props._yorg+ysize);
WINDOWINFO wi;
GetWindowInfo(_dxgsg->scrn.hWnd,&wi);
AdjustWindowRectEx(&win_rect, wi.dwStyle, false, wi.dwExStyle); //compute window size based on desired client area size
// make sure origin is on screen
if(win_rect.left < 0) {
win_rect.right -= win_rect.left; win_rect.left = 0;
_props._xorg=0;
}
if(win_rect.top < 0) {
win_rect.bottom -= win_rect.top; win_rect.top = 0;
_props._yorg=0;
}
SetWindowPos(_dxgsg->scrn.hWnd, NULL, win_rect.left,win_rect.top, RECT_XSIZE(win_rect), RECT_YSIZE(win_rect), SWP_NOZORDER | SWP_NOSENDCHANGING);
// WM_ERASEBKGND will be ignored, because _WindowAdjustingType!=NotAdjusting because // WM_ERASEBKGND will be ignored, because _WindowAdjustingType!=NotAdjusting because
// we dont want to redraw as user is manually resizing window, so need to force explicit // we dont want to redraw as user is manually resizing window, so need to force explicit
// background clear for the programmatic resize fn call // background clear for the programmatic resize fn call