TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoadisplay: Fix oversized window getting an awkward offset

Browse Source 
We currently do the centering based on the total screen size, not the screen size that macOS actually lets us use.

See #1312
This commit is contained in:
rdb 2022-12-16 16:07:58 +01:00
parent 38528b797b
commit 9cb60ccd93
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panda/src/cocoadisplay/cocoaGraphicsWindow.mm
View File

@ -1015,10 +1015,19 @@ set_properties_now(WindowProperties &properties) {
NSRect frame; NSRect frame;
NSRect container; NSRect container;
if (_window != nil) { if (_window != nil) {
frame = [_window contentRectForFrameRect:[_window frame]]; NSRect window_frame = [_window frame];
frame = [_window contentRectForFrameRect:window_frame];
NSScreen *screen = [_window screen]; NSScreen *screen = [_window screen];
nassertv(screen != nil); nassertv(screen != nil);
container = [screen frame]; container = [screen frame];
// Prevent the centering from overlapping the Dock
if (y < 0) {
NSRect visible_frame = [screen visibleFrame];
if (window_frame.size.height == visible_frame.size.height) {
y = 0;
}
}
} else { } else {
frame = [_view frame]; frame = [_view frame];
container = [[_view superview] frame]; container = [[_view superview] frame];