Revision: 6646
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6646&view=rev
Author:   hofman
Date:     2010-07-25 12:01:30 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
don't pass screen parameter in window initializer, as that shifts the frame 
relative to that screen, and does not have any other useful effect

Modified Paths:
--------------
    trunk/SKAnimatedBorderlessWindow.m
    trunk/SKFullScreenWindow.m
    trunk/SKSideWindow.m

Modified: trunk/SKAnimatedBorderlessWindow.m
===================================================================
--- trunk/SKAnimatedBorderlessWindow.m  2010-07-25 11:36:30 UTC (rev 6645)
+++ trunk/SKAnimatedBorderlessWindow.m  2010-07-25 12:01:30 UTC (rev 6646)
@@ -50,7 +50,7 @@
 @dynamic defaultAlphaValue, fadeInDuration, fadeOutDuration, 
autoHideTimeInterval;
 
 - (id)initWithContentRect:(NSRect)contentRect screen:(NSScreen *)screen {
-    if (self = [super initWithContentRect:contentRect 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO 
screen:screen]) {
+    if (self = [super initWithContentRect:contentRect 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]) {
                [self setBackgroundColor:[NSColor clearColor]];
                [self setOpaque:NO];
         [self setAlphaValue:[self defaultAlphaValue]];

Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m  2010-07-25 11:36:30 UTC (rev 6645)
+++ trunk/SKFullScreenWindow.m  2010-07-25 12:01:30 UTC (rev 6646)
@@ -50,12 +50,13 @@
 - (id)initWithScreen:(NSScreen *)screen {
     if (screen == nil)
         screen = [NSScreen mainScreen];
-    if (self = [self initWithContentRect:[screen frame] 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO 
screen:screen]) {
+    NSRect screenFrame = [screen frame];
+    if (self = [self initWithContentRect:screenFrame 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]) {
         [self setBackgroundColor:[NSColor blackColor]];
         [self setReleasedWhenClosed:NO];
         [self setExcludedFromWindowsMenu:YES];
-        // appartently this is needed due to a bug on 10.5
-        [self setFrame:[screen frame] display:NO];
+        // appartently this is needed for secondary screens
+        [self setFrame:screenFrame display:NO];
     }
     return self;
 }

Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m        2010-07-25 11:36:30 UTC (rev 6645)
+++ trunk/SKSideWindow.m        2010-07-25 12:01:30 UTC (rev 6646)
@@ -82,7 +82,7 @@
     NSDivideRect([screen frame], &contentRect, &ignored, DEFAULT_WINDOW_WIDTH, 
anEdge);
     contentRect = NSInsetRect(contentRect, 0.0, WINDOW_INSET);
     
-    if (self = [super initWithContentRect:contentRect 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO 
screen:screen]) {
+    if (self = [super initWithContentRect:contentRect 
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]) {
                [self setBackgroundColor:[NSColor clearColor]];
                [self setOpaque:NO];
                [self setHasShadow:YES];


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to