Revision: 5428
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5428&view=rev
Author:   hofman
Date:     2009-06-16 12:11:46 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
Enable split pdf in full screen mode. Swap in the full splitview in fullscreen 
mode and swap it in/out when switching between fullscreen and presentation 
modes. Insert an additional content view in the main splitview hierarchy so we 
can swap. We build up the view hierarchy programmatically because nib loading 
messes up the view hierarchy in a splitview.

Modified Paths:
--------------
    trunk/MainWindow.nib/classes.nib
    trunk/MainWindow.nib/info.nib
    trunk/MainWindow.nib/keyedobjects.nib
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_Actions.m
    trunk/SKMainWindowController_UI.m
    trunk/SKPDFView.m

Modified: trunk/MainWindow.nib/classes.nib
===================================================================
--- trunk/MainWindow.nib/classes.nib    2009-06-15 17:41:10 UTC (rev 5427)
+++ trunk/MainWindow.nib/classes.nib    2009-06-16 12:11:46 UTC (rev 5428)
@@ -72,6 +72,14 @@
                </dict>
                <dict>
                        <key>CLASS</key>
+                       <string>SKTocOutlineView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>SKOutlineView</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
                        <string>SKMainWindow</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
@@ -80,13 +88,21 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>SKTocOutlineView</string>
+                       <string>NSWindowController</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>SKOutlineView</string>
+                       <string>NSResponder</string>
                </dict>
                <dict>
+                       <key>CLASS</key>
+                       <string>NSMenu</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
                        <key>ACTIONS</key>
                        <dict>
                                <key>addBookmark</key>
@@ -265,6 +281,8 @@
                                <string>id</string>
                                <key>zoomInActualOut</key>
                                <string>id</string>
+                               <key>zoomLog</key>
+                               <string>id</string>
                        </dict>
                        <key>CLASS</key>
                        <string>SKMainWindowController</string>
@@ -352,6 +370,8 @@
                                <string>NSObjectController</string>
                                <key>pageNumberField</key>
                                <string>NSTextField</string>
+                               <key>pdfContentView</key>
+                               <string>NSView</string>
                                <key>pdfEdgeView</key>
                                <string>BDSKEdgeView</string>
                                <key>pdfSplitView</key>
@@ -429,22 +449,6 @@
                        <string>NSWindowController</string>
                </dict>
                <dict>
-                       <key>CLASS</key>
-                       <string>NSWindowController</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSMenu</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
                        <key>ACTIONS</key>
                        <dict>
                                <key>changeDashPattern</key>
@@ -507,19 +511,19 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSScrollView</string>
+                       <string>SKSegmentedControl</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSView</string>
+                       <string>NSSegmentedControl</string>
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>SKSegmentedControl</string>
+                       <string>NSScrollView</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSSegmentedControl</string>
+                       <string>NSView</string>
                </dict>
                <dict>
                        <key>CLASS</key>

Modified: trunk/MainWindow.nib/info.nib
===================================================================
--- trunk/MainWindow.nib/info.nib       2009-06-15 17:41:10 UTC (rev 5427)
+++ trunk/MainWindow.nib/info.nib       2009-06-16 12:11:46 UTC (rev 5428)
@@ -11,7 +11,7 @@
        <key>IBOpenObjects</key>
        <array/>
        <key>IBSystem Version</key>
-       <string>9G55</string>
+       <string>9J61</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>

Modified: trunk/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-06-15 17:41:10 UTC (rev 5427)
+++ trunk/SKMainWindowController.h      2009-06-16 12:11:46 UTC (rev 5428)
@@ -71,6 +71,7 @@
 @interface SKMainWindowController : NSWindowController {
     IBOutlet SKSplitView            *splitView;
     
+    IBOutlet NSView                 *pdfContentView;
     IBOutlet SKSplitView            *pdfSplitView;
     IBOutlet BDSKEdgeView           *pdfEdgeView;
     IBOutlet SKPDFView              *pdfView;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-06-15 17:41:10 UTC (rev 5427)
+++ trunk/SKMainWindowController.m      2009-06-16 12:11:46 UTC (rev 5428)
@@ -294,6 +294,9 @@
     [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
     
+    [pdfSplitView setFrame:[pdfContentView bounds]];
+    [pdfContentView addSubview:pdfSplitView];
+    
     if (mwcFlags.usesDrawers == 0 || floor(NSAppKitVersionNumber) > 
NSAppKitVersionNumber10_4) {
         [leftSideButton makeTexturedRounded];
         [rightSideButton makeTexturedRounded];
@@ -310,6 +313,8 @@
     // This gets sometimes messed up in the nib, AppKit bug rdar://5346690
     [leftSideContentView setAutoresizesSubviews:YES];
     [rightSideContentView setAutoresizesSubviews:YES];
+    [pdfContentView setAutoresizesSubviews:YES];
+    [pdfEdgeView setAutoresizesSubviews:YES];
     
     [leftSideView setFrame:[leftSideContentView bounds]];
     [leftSideContentView addSubview:leftSideView];
@@ -358,7 +363,7 @@
         [rightSideEdgeView setEdges:BDSKNoEdgeMask];
         [rightSideDrawer openOnEdge:NSMaxXEdge];
         [rightSideDrawer setDelegate:self];
-        [pdfSplitView setFrame:[splitView bounds]];
+        [pdfContentView setFrame:[splitView bounds]];
     } else {
         [pdfSplitView setBlendEnds:YES];
     }
@@ -517,10 +522,10 @@
         }
     }
     if (mwcFlags.usesDrawers == 0) {
-        frame = [pdfSplitView frame];
+        frame = [pdfContentView frame];
         frame.size.width = NSWidth([splitView frame]) - 
NSWidth([leftSideContentView frame]) - NSWidth([rightSideContentView frame]) - 
2 * [splitView dividerThickness];
         frame.origin.x = NSMaxX([leftSideContentView frame]) + [splitView 
dividerThickness];
-        [pdfSplitView setFrame:frame];
+        [pdfContentView setFrame:frame];
     }
 }
 
@@ -1317,8 +1322,8 @@
     [self showLeftSideWindowOnScreen:screen];
     [self showRightSideWindowOnScreen:screen];
     
-    [pdfView setFrame:NSInsetRect([[pdfView superview] bounds], 9.0, 0.0)];
-    [[pdfView superview] setNeedsDisplay:YES];
+    [pdfSplitView setFrame:NSInsetRect([[pdfSplitView superview] bounds], 9.0, 
0.0)];
+    [[pdfSplitView superview] setNeedsDisplay:YES];
 }
 
 - (void)hideSideWindows {
@@ -1343,10 +1348,17 @@
     
     if ([[mainWindow firstResponder] isDescendantOf:pdfView])
         [mainWindow makeFirstResponder:nil];
-    [fullScreenWindow setMainView:pdfView];
+    if ([self isPresentation]) {
+        [fullScreenWindow setMainView:pdfView];
+    } else {
+        [fullScreenWindow setMainView:pdfSplitView];
+        [pdfEdgeView setEdges:[secondaryPdfView window] ? BDSKMinYEdgeMask : 
BDSKNoEdgeMask];
+        [secondaryPdfEdgeView setEdges:BDSKMaxYEdgeMask];
+    }
     [fullScreenWindow setBackgroundColor:backgroundColor];
     [fullScreenWindow setLevel:[self isPresentation] ? NSPopUpMenuWindowLevel 
: NSNormalWindowLevel];
     [pdfView setBackgroundColor:backgroundColor];
+    [secondaryPdfView setBackgroundColor:backgroundColor];
     [pdfView layoutDocumentView];
     [pdfView setNeedsDisplay:YES];
     
@@ -1421,6 +1433,7 @@
     
     NSColor *backgroundColor = [NSColor blackColor];
     [pdfView setBackgroundColor:backgroundColor];
+    [secondaryPdfView setBackgroundColor:backgroundColor];
     [fullScreenWindow setBackgroundColor:backgroundColor];
     [fullScreenWindow setLevel:NSPopUpMenuWindowLevel];
     
@@ -1460,6 +1473,11 @@
     
     if ([self isPresentation]) {
         [self exitPresentationMode];
+        [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
+        [pdfEdgeView addSubview:pdfView];
+        [fullScreenWindow setMainView:pdfSplitView];
+        [pdfEdgeView setEdges:[secondaryPdfView window] ? BDSKMinYEdgeMask : 
BDSKNoEdgeMask];
+        [secondaryPdfEdgeView setEdges:BDSKMaxYEdgeMask];
     } else {
         [self saveNormalSetup];
         [self goFullScreen];
@@ -1467,6 +1485,7 @@
     
     NSColor *backgroundColor = [[NSUserDefaults standardUserDefaults] 
colorForKey:SKFullScreenBackgroundColorKey];
     [pdfView setBackgroundColor:backgroundColor];
+    [secondaryPdfView setBackgroundColor:backgroundColor];
     [fullScreenWindow setBackgroundColor:backgroundColor];
     [fullScreenWindow setLevel:NSNormalWindowLevel];
     
@@ -1492,10 +1511,16 @@
     else
         SetSystemUIMode(kUIModeNormal, kUIOptionDisableProcessSwitch);
     
-    if (wasFullScreen)
+    if (wasFullScreen) {
+        [pdfSplitView setFrame:[pdfContentView bounds]];
+        [pdfContentView addSubview:pdfSplitView];
+        [pdfEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask | 
BDSKMinYEdgeMask];
+        [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
+        [fullScreenWindow setMainView:pdfView];
         [self hideSideWindows];
-    else
+    } else {
         [self goFullScreen];
+    }
     
     [pdfView setInteractionMode:SKPresentationMode screen:screen];
 }
@@ -1518,9 +1543,18 @@
     [fullScreenWindow fadeOutBlocking:YES];
     
     [pdfView setInteractionMode:SKNormalMode screen:[[self window] screen]];
-    [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
-    [pdfEdgeView addSubview:pdfView]; // this should be done before 
exitPresentationMode to get a smooth transition
+    // this should be done before exitPresentationMode to get a smooth 
transition
+    if ([self isFullScreen]) {
+        [pdfSplitView setFrame:[pdfContentView bounds]];
+        [pdfContentView addSubview:pdfSplitView];
+        [pdfEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask | 
BDSKMinYEdgeMask];
+        [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
+    } else {
+        [pdfView setFrame:[[pdfEdgeView contentView] bounds]];
+        [pdfEdgeView addSubview:pdfView]; 
+    }
     [pdfView setBackgroundColor:[[NSUserDefaults standardUserDefaults] 
colorForKey:SKBackgroundColorKey]];
+    [secondaryPdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
     [pdfView layoutDocumentView];
     
     if ([self isPresentation])
@@ -2290,14 +2324,16 @@
         // A default value that we are observing has changed
         NSString *key = [keyPath substringFromIndex:7];
         if ([key isEqualToString:SKBackgroundColorKey]) {
-            if ([self isFullScreen] == NO && [self isPresentation] == NO)
+            if ([self isFullScreen] == NO && [self isPresentation] == NO) {
                 [pdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
-            [secondaryPdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
+                [secondaryPdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
+            }
         } else if ([key isEqualToString:SKFullScreenBackgroundColorKey]) {
             if ([self isFullScreen]) {
                 NSColor *color = [[NSUserDefaults standardUserDefaults] 
colorForKey:SKFullScreenBackgroundColorKey];
                 if (color) {
                     [pdfView setBackgroundColor:color];
+                    [secondaryPdfView setBackgroundColor:color];
                     [fullScreenWindow setBackgroundColor:color];
                     [[fullScreenWindow contentView] setNeedsDisplay:YES];
                     

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2009-06-15 17:41:10 UTC (rev 
5427)
+++ trunk/SKMainWindowController_Actions.m      2009-06-16 12:11:46 UTC (rev 
5428)
@@ -1034,7 +1034,7 @@
         }
     } else {
         NSRect sideFrame = [leftSideContentView frame];
-        NSRect pdfFrame = [pdfSplitView frame];
+        NSRect pdfFrame = [pdfContentView frame];
         
         if ([self leftSidePaneIsOpen]) {
             if (mwcFlags.leftSidePaneState == SKOutlineSidePaneState || 
[[searchField stringValue] length])
@@ -1052,7 +1052,7 @@
         }
         pdfFrame.origin.x = NSMaxX(sideFrame) + [splitView dividerThickness];
         [leftSideContentView setFrame:sideFrame];
-        [pdfSplitView setFrame:pdfFrame];
+        [pdfContentView setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
         [[self window] invalidateCursorRectsForView:splitView];
         
@@ -1086,7 +1086,7 @@
             [rightSideDrawer openOnEdge:NSMaxXEdge];
     } else {
         NSRect sideFrame = [rightSideContentView frame];
-        NSRect pdfFrame = [pdfSplitView frame];
+        NSRect pdfFrame = [pdfContentView frame];
         
         if ([self rightSidePaneIsOpen]) {
             lastRightSidePaneWidth = NSWidth(sideFrame); // cache this
@@ -1102,7 +1102,7 @@
         }
         sideFrame.origin.x = NSMaxX(pdfFrame) + [splitView dividerThickness];
         [rightSideContentView setFrame:sideFrame];
-        [pdfSplitView setFrame:pdfFrame];
+        [pdfContentView setFrame:pdfFrame];
         [splitView setNeedsDisplay:YES];
         [[self window] invalidateCursorRectsForView:splitView];
         
@@ -1139,6 +1139,8 @@
     if ([secondaryPdfView window]) {
         
         [secondaryPdfEdgeView removeFromSuperview];
+        if ([self isFullScreen])
+            [pdfEdgeView setEdges:BDSKNoEdgeMask];
         
     } else {
         
@@ -1151,7 +1153,6 @@
         
         if (secondaryPdfView == nil) {
             secondaryPdfEdgeView = [[BDSKEdgeView alloc] initWithFrame:frame2];
-            [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
             secondaryPdfView = [[SKSecondaryPDFView alloc] 
initWithFrame:[[secondaryPdfEdgeView contentView] bounds]];
             [secondaryPdfView setAutoresizingMask:NSViewWidthSizable | 
NSViewHeightSizable];
             [secondaryPdfEdgeView addSubview:secondaryPdfView];
@@ -1167,12 +1168,21 @@
             [secondaryPdfEdgeView setFrame:frame2];
             [pdfSplitView addSubview:secondaryPdfEdgeView];
         }
+        if ([self isFullScreen]) {
+            [secondaryPdfEdgeView setEdges:BDSKMaxYEdgeMask];
+            [pdfEdgeView setEdges:BDSKMinYEdgeMask];
+        } else {
+            [secondaryPdfEdgeView setEdges:BDSKEveryEdgeMask];
+            [pdfEdgeView setEdges:BDSKEveryEdgeMask];
+        }
         
         [self performSelector:@selector(scrollSecondaryPdfView) withObject:nil 
afterDelay:0.0];
     }
     
     [pdfSplitView adjustSubviews];
     [[self window] recalculateKeyViewLoop];
+    if ([self isFullScreen])
+        [[self window] makeFirstResponder:pdfView];
 }
 
 - (IBAction)toggleFullScreen:(id)sender {

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2009-06-15 17:41:10 UTC (rev 5427)
+++ trunk/SKMainWindowController_UI.m   2009-06-16 12:11:46 UTC (rev 5428)
@@ -1409,7 +1409,7 @@
             [menuItem setTitle:NSLocalizedString(@"Hide Split PDF", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Show Split PDF", @"Menu 
item title")];
-        return [self isPresentation] == NO && [self isFullScreen] == NO;
+        return [self isPresentation] == NO;
     } else if (action == @selector(toggleStatusBar:)) {
         if ([statusBar isVisible])
             [menuItem setTitle:NSLocalizedString(@"Hide Status Bar", @"Menu 
item title")];

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2009-06-15 17:41:10 UTC (rev 5427)
+++ trunk/SKPDFView.m   2009-06-16 12:11:46 UTC (rev 5428)
@@ -1499,7 +1499,7 @@
     NSTrackingRectTag trackingNumber = [theEvent trackingNumber];
     [super mouseExited:theEvent];
     if (trackingNumber == trackingRect) {
-        [[self window] setAcceptsMouseMovedEvents:NO];
+        [[self window] setAcceptsMouseMovedEvents:([self interactionMode] == 
SKFullScreenMode)];
     } else if (PDFToolTipRect == trackingNumber) {
         [[SKPDFToolTipWindow sharedToolTipWindow] fadeOut];
         PDFToolTipRect = 0;


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

------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to