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

I think I messed up in my latest commit. Let's try it again.

Browse Source
This commit is contained in:
rdb 2009-12-17 18:08:29 +00:00
parent cc5c081795
commit 161c92ba7a
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -585,21 +585,7 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin,
<< ", " << has_origin << ", " << x_size << ", " << y_size << ")\n"; << ", " << has_origin << ", " << x_size << ", " << y_size << ")\n";
} }
if (!is_fullscreen()) { if (!is_fullscreen()) {
// Compute the appropriate size and placement for the window,
// including decorations.
RECT view_rect;
SetRect(&view_rect, x_origin, y_origin,
x_origin + x_size, y_origin + y_size);
WINDOWINFO wi;
GetWindowInfo(_hWnd, &wi);
AdjustWindowRectEx(&view_rect, wi.dwStyle, FALSE, wi.dwExStyle);
UINT flags = SWP_NOZORDER | SWP_NOSENDCHANGING;
if (has_origin) { if (has_origin) {
x_origin = view_rect.left;
y_origin = view_rect.top;
// A coordinate of -2 means to center the window in its client area. // A coordinate of -2 means to center the window in its client area.
if (x_origin == -2) { if (x_origin == -2) {
x_origin = 0.5 * (_pipe->get_display_width() - x_size); x_origin = 0.5 * (_pipe->get_display_width() - x_size);
@ -614,6 +600,22 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin,
if (y_origin = -1) { if (y_origin = -1) {
y_origin = CW_USEDEFAULT; y_origin = CW_USEDEFAULT;
} }
}
// Compute the appropriate size and placement for the window,
// including decorations.
RECT view_rect;
SetRect(&view_rect, x_origin, y_origin,
x_origin + x_size, y_origin + y_size);
WINDOWINFO wi;
GetWindowInfo(_hWnd, &wi);
AdjustWindowRectEx(&view_rect, wi.dwStyle, FALSE, wi.dwExStyle);
UINT flags = SWP_NOZORDER | SWP_NOSENDCHANGING;
if (has_origin) {
x_origin = view_rect.left;
y_origin = view_rect.top;
} else { } else {
x_origin = CW_USEDEFAULT; x_origin = CW_USEDEFAULT;
y_origin = CW_USEDEFAULT; y_origin = CW_USEDEFAULT;
@ -789,6 +791,21 @@ open_graphic_window(bool fullscreen) {
if (!fullscreen && _properties.has_origin()) { if (!fullscreen && _properties.has_origin()) {
x_origin = _properties.get_x_origin(); x_origin = _properties.get_x_origin();
y_origin = _properties.get_y_origin(); y_origin = _properties.get_y_origin();
// A coordinate of -2 means to center the window in its client area.
if (x_origin == -2) {
x_origin = 0.5 * (_pipe->get_display_width() - x_size);
}
if (y_origin == -2) {
y_origin = 0.5 * (_pipe->get_display_height() - y_size);
}
_properties.set_origin(x_origin, y_origin);
if (x_origin = -1) {
x_origin = CW_USEDEFAULT;
}
if (y_origin = -1) {
y_origin = CW_USEDEFAULT;
}
} }
int x_size = _properties.get_x_size(); int x_size = _properties.get_x_size();
@ -808,32 +825,16 @@ open_graphic_window(bool fullscreen) {
<< "AdjustWindowRect failed!" << endl; << "AdjustWindowRect failed!" << endl;
return false; return false;
} }
clientAreaWidth = win_rect.right - win_rect.left;
clientAreaHeight = win_rect.bottom - win_rect.top;
if (_properties.has_origin()) { if (_properties.has_origin()) {
x_origin = win_rect.left; x_origin = win_rect.left;
y_origin = win_rect.top; y_origin = win_rect.top;
// A coordinate of -2 means to center the window on the screen.
if (x_origin == -2) {
x_origin = 0.5 * (_pipe->get_display_width() - x_size);
}
if (y_origin == -2) {
y_origin = 0.5 * (_pipe->get_display_height() - y_size);
}
_properties.set_origin(x_origin, y_origin);
if (x_origin = -1) {
x_origin = CW_USEDEFAULT;
}
if (y_origin = -1) {
y_origin = CW_USEDEFAULT;
}
} else { } else {
x_origin = CW_USEDEFAULT; x_origin = CW_USEDEFAULT;
y_origin = CW_USEDEFAULT; y_origin = CW_USEDEFAULT;
} }
clientAreaWidth = win_rect.right - win_rect.left;
clientAreaHeight = win_rect.bottom - win_rect.top;
} }
const WindowClass &wclass = register_window_class(_properties); const WindowClass &wclass = register_window_class(_properties);