mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac OS: better window positioning on secondary displays at creation.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9176 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-11-14 15:15:03 +00:00
parent 6b1db04a80
commit 74720fd205
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Fl_cocoa.mm
View File

@ -576,21 +576,7 @@ static void do_timer(CFRunLoopTimerRef timer, void* data)
contentRect:(NSRect)rect
styleMask:(NSUInteger)windowStyle
{
NSScreen *gd = nil; // gd will point to the screen containing the bottom-left of rect
NSArray *a = [NSScreen screens];
for(NSUInteger i = 0; i < [a count]; i++) {
NSRect r = [[a objectAtIndex:i] frame];
if (rect.origin.x >= r.origin.x && rect.origin.x <= r.origin.x + r.size.width
&& rect.origin.y >= r.origin.y && rect.origin.y <= r.origin.y + r.size.height) {
gd = [a objectAtIndex:i];
rect.origin.x -= r.origin.x; // express rect relatively to gd's origin
rect.origin.y -= r.origin.y;
break;
}
}
// attempt to create the window on screen gd
self = [super initWithContentRect:rect styleMask:windowStyle backing:NSBackingStoreBuffered defer:NO
screen:gd];
self = [super initWithContentRect:rect styleMask:windowStyle backing:NSBackingStoreBuffered defer:NO];
if (self) {
w = flw;
containsGLsubwindow = NO;
@ -2077,6 +2063,7 @@ void Fl_X::make(Fl_Window* w)
FLWindow *cw = [[FLWindow alloc] initWithFl_W:w
contentRect:crect
styleMask:winstyle];
[cw setFrameOrigin:crect.origin];
[cw setHasShadow:YES];
[cw setAcceptsMouseMovedEvents:YES];
x->xid = cw;