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

auto-center windows, Windows case (untested)

Browse Source
This commit is contained in:
rdb 2009-12-16 12:30:33 +00:00
parent 9dcbaf835d
commit 1ad9a31163
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,6 +600,20 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin,
x_origin = view_rect.left; x_origin = view_rect.left;
y_origin = view_rect.top; y_origin = view_rect.top;
// 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;
}
} else { } else {
x_origin = CW_USEDEFAULT; x_origin = CW_USEDEFAULT;
y_origin = CW_USEDEFAULT; y_origin = CW_USEDEFAULT;
@ -788,23 +802,38 @@ open_graphic_window(bool fullscreen) {
SetRect(&win_rect, x_origin, y_origin, SetRect(&win_rect, x_origin, y_origin,
x_origin + x_size, y_origin + y_size); x_origin + x_size, y_origin + y_size);
// compute window size based on desired client area size // Compute window size based on desired client area size
if (!AdjustWindowRect(&win_rect, window_style, FALSE)) { if (!AdjustWindowRect(&win_rect, window_style, FALSE)) {
windisplay_cat.error() windisplay_cat.error()
<< "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);
@ -853,7 +882,7 @@ open_graphic_window(bool fullscreen) {
_hWnd = CreateWindow(wclass._name.c_str(), title.c_str(), _hWnd = CreateWindow(wclass._name.c_str(), title.c_str(),
WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS , WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS ,
x_origin,y_origin, x_origin, y_origin,
x_size, y_size, x_size, y_size,
_hparent, NULL, hinstance, 0); _hparent, NULL, hinstance, 0);