RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

window centering for OSX

This commit is contained in:
rdb 2009-12-16 14:27:15 +00:00
parent 11895d990a
commit 85fda457fa
1 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
panda/src/osxdisplay/osxGraphicsWindow.mm
View File

@ -1142,8 +1142,34 @@ os_open_window(WindowProperties &req_properties) {
} else {
Rect r;
if (req_properties.has_origin()) {
r.top = req_properties.get_y_origin();
r.left =req_properties.get_x_origin();
r.top = req_properties.get_y_origin();
r.left = req_properties.get_x_origin();
// A coordinate of -2 means to center the window on screen.
if (r.top == -2 || r.left == -2) {
if (req_properties.has_size()) {
if (r.top == -2) {
r.top = 0.5 * (_pipe->get_display_height() - req_properties.get_y_size());
}
if (r.left == -2) {
r.left = 0.5 * (_pipe->get_display_width() - req_properties.get_x_size());
}
} else {
if (r.top == -2) {
r.top = 0.5 * (_pipe->get_display_height() - req_properties.get_y_size());
}
if (r.left == -2) {
r.left = 0.5 * (_pipe->get_display_width() - req_properties.get_x_size());
}
}
_properties.set_origin(r.left, r.top);
}
if (r.top == -1) {
r.top = 50;
}
if (r.left == -1) {
r.left = 10;
}
} else {
r.top = 50;
r.left = 10;
@ -1791,6 +1817,24 @@ do_reshape_request(int x_origin, int y_origin, bool has_origin,
return false;
}
// A coordinate of -2 means to center the window on screen.
if (x_origin == -2 || y_origin == -2) {
if (y_origin == -2) {
y_origin = 0.5 * (_pipe->get_display_height() - y_size);
}
if (x_origin == -2) {
x_origin = 0.5 * (_pipe->get_display_width() - x_size);
}
if (r.top == -1) {
r.top = 50;
}
if (r.left == -1) {
r.left = 10;
}
_properties.set_origin(x_origin, y_origin);
system_changed_properties(_properties);
}
/*
if (_properties.has_parent_window()) {
if (has_origin) {