Revision: 6405
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6405&view=rev
Author:   hofman
Date:     2010-03-31 21:51:27 +0000 (Wed, 31 Mar 2010)

Log Message:
-----------
change edges in side views automatically based on window mask

Modified Paths:
--------------
    trunk/LeftSideView.xib
    trunk/RightSideView.xib
    trunk/SKMainWindowController.m
    trunk/SKSideViewController.h
    trunk/SKSideViewController.m
    trunk/Skim.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/SKEdgeView.h
    trunk/SKEdgeView.m

Modified: trunk/LeftSideView.xib
===================================================================
--- trunk/LeftSideView.xib      2010-03-31 21:40:17 UTC (rev 6404)
+++ trunk/LeftSideView.xib      2010-03-31 21:51:27 UTC (rev 6405)
@@ -38,7 +38,7 @@
                                <string key="NSClassName">NSApplication</string>
                        </object>
                        <object class="NSCustomView" id="905545468">
-                               <nil key="NSNextResponder"/>
+                               <reference key="NSNextResponder"/>
                                <int key="NSvFlags">274</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -52,6 +52,7 @@
                                                                <int 
key="NSvFlags">274</int>
                                                                <string 
key="NSFrameSize">{200, 355}</string>
                                                                <reference 
key="NSSuperview" ref="923866883"/>
+                                                               <reference 
key="NSWindow"/>
                                                                <object 
class="NSMutableString" key="NSClassName">
                                                                        
<characters key="NS.bytes">NSView</characters>
                                                                </object>
@@ -60,6 +61,7 @@
                                                </object>
                                                <string key="NSFrameSize">{200, 
355}</string>
                                                <reference key="NSSuperview" 
ref="905545468"/>
+                                               <reference key="NSWindow"/>
                                                <string 
key="NSClassName">NSView</string>
                                        </object>
                                        <object class="NSCustomView" 
id="909611649">
@@ -87,6 +89,7 @@
                                                                                
                                <int key="NSvFlags">260</int>
                                                                                
                                <string key="NSFrame">{{10, 8}, {57, 
25}}</string>
                                                                                
                                <reference key="NSSuperview" ref="25587430"/>
+                                                                               
                                <reference key="NSWindow"/>
                                                                                
                                <bool key="NSEnabled">YES</bool>
                                                                                
                                <object class="NSSegmentedCell" key="NSCell" 
id="145170310">
                                                                                
                                        <int key="NSCellFlags">67239424</int>
@@ -126,6 +129,7 @@
                                                                                
                </object>
                                                                                
                <string key="NSFrameSize">{77, 42}</string>
                                                                                
                <reference key="NSSuperview" ref="1067192785"/>
+                                                                               
                <reference key="NSWindow"/>
                                                                                
                <string key="NSClassName">NSView</string>
                                                                                
        </object>
                                                                                
        <object class="NSSearchField" id="827083746">
@@ -133,6 +137,7 @@
                                                                                
                <int key="NSvFlags">258</int>
                                                                                
                <string key="NSFrame">{{75, 11}, {115, 22}}</string>
                                                                                
                <reference key="NSSuperview" ref="1067192785"/>
+                                                                               
                <reference key="NSWindow"/>
                                                                                
                <bool key="NSEnabled">YES</bool>
                                                                                
                <object class="NSSearchFieldCell" key="NSCell" id="181483723">
                                                                                
                        <int key="NSCellFlags">343014976</int>
@@ -208,23 +213,28 @@
                                                                                
</object>
                                                                                
<string key="NSFrameSize">{200, 45}</string>
                                                                                
<reference key="NSSuperview" ref="453091411"/>
+                                                                               
<reference key="NSWindow"/>
                                                                                
<string key="NSClassName">SKGradientView</string>
                                                                                
<string key="NSExtension">NSView</string>
                                                                        
</object>
                                                                </object>
                                                                <string 
key="NSFrameSize">{200, 45}</string>
                                                                <reference 
key="NSSuperview" ref="909611649"/>
+                                                               <reference 
key="NSWindow"/>
                                                                <string 
key="NSClassName">BDSKCollapsibleView</string>
                                                                <string 
key="NSExtension">NSView</string>
                                                        </object>
                                                </object>
                                                <string key="NSFrame">{{0, 
355}, {200, 45}}</string>
                                                <reference key="NSSuperview" 
ref="905545468"/>
-                                               <string 
key="NSClassName">BDSKEdgeView</string>
+                                               <reference key="NSWindow"/>
+                                               <string 
key="NSClassName">SKEdgeView</string>
                                                <string 
key="NSExtension">NSView</string>
                                        </object>
                                </object>
                                <string key="NSFrameSize">{200, 400}</string>
+                               <reference key="NSSuperview"/>
+                               <reference key="NSWindow"/>
                                <object class="NSMutableString" 
key="NSClassName">
                                        <characters 
key="NS.bytes">NSView</characters>
                                </object>
@@ -1316,22 +1326,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">edgeView</string>
-                                               <reference key="source" 
ref="1001"/>
-                                               <reference key="destination" 
ref="909611649"/>
-                                       </object>
-                                       <int key="connectionID">169</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">gradientView</string>
-                                               <reference key="source" 
ref="1001"/>
-                                               <reference key="destination" 
ref="1067192785"/>
-                                       </object>
-                                       <int key="connectionID">170</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" 
key="connection">
                                                <string 
key="label">searchField</string>
                                                <reference key="source" 
ref="1001"/>
                                                <reference key="destination" 
ref="827083746"/>
@@ -2319,6 +2313,14 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">SKEdgeView</string>
+                                       <string 
key="superclassName">BDSKEdgeView</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKEdgeView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">SKFindTableView</string>
                                        <string 
key="superclassName">SKTableView</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2376,6 +2378,61 @@
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">SKMainToolbarController</string>
                                        <string 
key="superclassName">NSViewController</string>
+                                       <object class="NSMutableDictionary" 
key="actions">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>changeDisplayBox:</string>
+                                                       
<string>changeDisplayContinuous:</string>
+                                                       
<string>changeDisplayMode:</string>
+                                                       
<string>changeDisplaySinglePages:</string>
+                                                       
<string>changeScaleFactor:</string>
+                                                       
<string>changeToolMode:</string>
+                                                       
<string>chooseScale:</string>
+                                                       
<string>createNewCircleNote:</string>
+                                                       
<string>createNewMarkupNote:</string>
+                                                       
<string>createNewNote:</string>
+                                                       
<string>createNewTextNote:</string>
+                                                       
<string>cropAll:</string>
+                                                       
<string>enterFullScreen:</string>
+                                                       
<string>enterPresentation:</string>
+                                                       
<string>goBackOrForward:</string>
+                                                       
<string>goToPreviousNextFirstLastPage:</string>
+                                                       
<string>rotateAllLeftRight:</string>
+                                                       
<string>selectColor:</string>
+                                                       
<string>toggleLeftSidePane:</string>
+                                                       
<string>toggleRightSidePane:</string>
+                                                       
<string>zoomInActualOut:</string>
+                                                       
<string>zoomToFit:</string>
+                                                       
<string>zoomToSelection:</string>
+                                               </object>
+                                               <object class="NSMutableArray" 
key="dict.values">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                               </object>
+                                       </object>
                                        <object class="NSMutableDictionary" 
key="outlets">
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
@@ -2549,16 +2606,10 @@
                                                        
<string>changeFont:</string>
                                                        
<string>changeLeftSidePaneState:</string>
                                                        
<string>changeRightSidePaneState:</string>
-                                                       
<string>changeScaleFactor:</string>
                                                        
<string>changeToolMode:</string>
-                                                       
<string>chooseScale:</string>
                                                        
<string>chooseTransition:</string>
                                                        <string>copy:</string>
-                                                       
<string>createNewCircleNote:</string>
-                                                       
<string>createNewLineNote:</string>
-                                                       
<string>createNewMarkupNote:</string>
                                                        
<string>createNewNote:</string>
-                                                       
<string>createNewTextNote:</string>
                                                        <string>crop:</string>
                                                        
<string>cropAll:</string>
                                                        <string>cut:</string>
@@ -2582,22 +2633,18 @@
                                                        
<string>doZoomToSelection:</string>
                                                        
<string>editNote:</string>
                                                        
<string>getInfo:</string>
-                                                       
<string>goBackOrForward:</string>
                                                        
<string>goToMarkedPage:</string>
-                                                       
<string>goToPreviousNextFirstLastPage:</string>
                                                        
<string>markPage:</string>
                                                        
<string>password:</string>
                                                        <string>paste:</string>
                                                        
<string>pasteAsPlainText:</string>
                                                        
<string>performFit:</string>
                                                        
<string>rotateAllLeft:</string>
-                                                       
<string>rotateAllLeftRight:</string>
                                                        
<string>rotateAllRight:</string>
                                                        
<string>rotateLeft:</string>
                                                        
<string>rotateRight:</string>
                                                        
<string>savePDFSettingToDefaults:</string>
                                                        
<string>searchPDF:</string>
-                                                       
<string>selectColor:</string>
                                                        
<string>smartAutoCropAll:</string>
                                                        
<string>takeSnapshot:</string>
                                                        
<string>toggleAutoScale:</string>
@@ -2615,7 +2662,6 @@
                                                        
<string>toggleSplitPDF:</string>
                                                        
<string>toggleStatusBar:</string>
                                                        
<string>toggleWholeWordSearch:</string>
-                                                       
<string>zoomInActualOut:</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -2696,17 +2742,6 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2846,8 +2881,6 @@
                                                        <string>button</string>
                                                        
<string>collapsibleView</string>
                                                        
<string>currentView</string>
-                                                       
<string>edgeView</string>
-                                                       
<string>gradientView</string>
                                                        
<string>mainController</string>
                                                        
<string>searchField</string>
                                                </object>
@@ -2857,8 +2890,6 @@
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>BDSKCollapsibleView</string>
                                                        <string>NSView</string>
-                                                       
<string>BDSKEdgeView</string>
-                                                       
<string>SKGradientView</string>
                                                        
<string>SKMainWindowController</string>
                                                        
<string>NSSearchField</string>
                                                </object>

Modified: trunk/RightSideView.xib
===================================================================
--- trunk/RightSideView.xib     2010-03-31 21:40:17 UTC (rev 6404)
+++ trunk/RightSideView.xib     2010-03-31 21:51:27 UTC (rev 6405)
@@ -208,7 +208,7 @@
                                                </object>
                                                <string key="NSFrame">{{0, 
355}, {200, 45}}</string>
                                                <reference key="NSSuperview" 
ref="846732309"/>
-                                               <string 
key="NSClassName">BDSKEdgeView</string>
+                                               <string 
key="NSClassName">SKEdgeView</string>
                                                <string 
key="NSExtension">NSView</string>
                                        </object>
                                </object>
@@ -802,22 +802,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">edgeView</string>
-                                               <reference key="source" 
ref="1001"/>
-                                               <reference key="destination" 
ref="772521819"/>
-                                       </object>
-                                       <int key="connectionID">52</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">gradientView</string>
-                                               <reference key="source" 
ref="1001"/>
-                                               <reference key="destination" 
ref="526591717"/>
-                                       </object>
-                                       <int key="connectionID">53</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" 
key="connection">
                                                <string 
key="label">searchField</string>
                                                <reference key="source" 
ref="1001"/>
                                                <reference key="destination" 
ref="518528093"/>
@@ -1567,6 +1551,14 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">SKEdgeView</string>
+                                       <string 
key="superclassName">BDSKEdgeView</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKEdgeView.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">SKGradientView</string>
                                        <string 
key="superclassName">NSView</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1608,6 +1600,61 @@
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">SKMainToolbarController</string>
                                        <string 
key="superclassName">NSViewController</string>
+                                       <object class="NSMutableDictionary" 
key="actions">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>changeDisplayBox:</string>
+                                                       
<string>changeDisplayContinuous:</string>
+                                                       
<string>changeDisplayMode:</string>
+                                                       
<string>changeDisplaySinglePages:</string>
+                                                       
<string>changeScaleFactor:</string>
+                                                       
<string>changeToolMode:</string>
+                                                       
<string>chooseScale:</string>
+                                                       
<string>createNewCircleNote:</string>
+                                                       
<string>createNewMarkupNote:</string>
+                                                       
<string>createNewNote:</string>
+                                                       
<string>createNewTextNote:</string>
+                                                       
<string>cropAll:</string>
+                                                       
<string>enterFullScreen:</string>
+                                                       
<string>enterPresentation:</string>
+                                                       
<string>goBackOrForward:</string>
+                                                       
<string>goToPreviousNextFirstLastPage:</string>
+                                                       
<string>rotateAllLeftRight:</string>
+                                                       
<string>selectColor:</string>
+                                                       
<string>toggleLeftSidePane:</string>
+                                                       
<string>toggleRightSidePane:</string>
+                                                       
<string>zoomInActualOut:</string>
+                                                       
<string>zoomToFit:</string>
+                                                       
<string>zoomToSelection:</string>
+                                               </object>
+                                               <object class="NSMutableArray" 
key="dict.values">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                               </object>
+                                       </object>
                                        <object class="NSMutableDictionary" 
key="outlets">
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
@@ -1781,16 +1828,10 @@
                                                        
<string>changeFont:</string>
                                                        
<string>changeLeftSidePaneState:</string>
                                                        
<string>changeRightSidePaneState:</string>
-                                                       
<string>changeScaleFactor:</string>
                                                        
<string>changeToolMode:</string>
-                                                       
<string>chooseScale:</string>
                                                        
<string>chooseTransition:</string>
                                                        <string>copy:</string>
-                                                       
<string>createNewCircleNote:</string>
-                                                       
<string>createNewLineNote:</string>
-                                                       
<string>createNewMarkupNote:</string>
                                                        
<string>createNewNote:</string>
-                                                       
<string>createNewTextNote:</string>
                                                        <string>crop:</string>
                                                        
<string>cropAll:</string>
                                                        <string>cut:</string>
@@ -1814,22 +1855,18 @@
                                                        
<string>doZoomToSelection:</string>
                                                        
<string>editNote:</string>
                                                        
<string>getInfo:</string>
-                                                       
<string>goBackOrForward:</string>
                                                        
<string>goToMarkedPage:</string>
-                                                       
<string>goToPreviousNextFirstLastPage:</string>
                                                        
<string>markPage:</string>
                                                        
<string>password:</string>
                                                        <string>paste:</string>
                                                        
<string>pasteAsPlainText:</string>
                                                        
<string>performFit:</string>
                                                        
<string>rotateAllLeft:</string>
-                                                       
<string>rotateAllLeftRight:</string>
                                                        
<string>rotateAllRight:</string>
                                                        
<string>rotateLeft:</string>
                                                        
<string>rotateRight:</string>
                                                        
<string>savePDFSettingToDefaults:</string>
                                                        
<string>searchPDF:</string>
-                                                       
<string>selectColor:</string>
                                                        
<string>smartAutoCropAll:</string>
                                                        
<string>takeSnapshot:</string>
                                                        
<string>toggleAutoScale:</string>
@@ -1847,7 +1884,6 @@
                                                        
<string>toggleSplitPDF:</string>
                                                        
<string>toggleStatusBar:</string>
                                                        
<string>toggleWholeWordSearch:</string>
-                                                       
<string>zoomInActualOut:</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -1928,17 +1964,6 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2078,8 +2103,6 @@
                                                        <string>button</string>
                                                        
<string>collapsibleView</string>
                                                        
<string>currentView</string>
-                                                       
<string>edgeView</string>
-                                                       
<string>gradientView</string>
                                                        
<string>mainController</string>
                                                        
<string>searchField</string>
                                                </object>
@@ -2089,8 +2112,6 @@
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>BDSKCollapsibleView</string>
                                                        <string>NSView</string>
-                                                       
<string>BDSKEdgeView</string>
-                                                       
<string>SKGradientView</string>
                                                        
<string>SKMainWindowController</string>
                                                        
<string>NSSearchField</string>
                                                </object>

Added: trunk/SKEdgeView.h
===================================================================
--- trunk/SKEdgeView.h                          (rev 0)
+++ trunk/SKEdgeView.h  2010-03-31 21:51:27 UTC (rev 6405)
@@ -0,0 +1,44 @@
+//
+//  SKEdgeView.h
+//  Skim
+//
+//  Created by Christiaan on 3/31/10.
+/*
+ This software is Copyright (c) 2010
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import "BDSKEdgeView.h"
+
+
+...@interface SKEdgeView : BDSKEdgeView
+...@end

Added: trunk/SKEdgeView.m
===================================================================
--- trunk/SKEdgeView.m                          (rev 0)
+++ trunk/SKEdgeView.m  2010-03-31 21:51:27 UTC (rev 6405)
@@ -0,0 +1,48 @@
+//
+//  SKEdgeView.m
+//  Skim
+//
+//  Created by Christiaan on 3/31/10.
+/*
+ This software is Copyright (c) 2010
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKEdgeView.h"
+
+
+...@implementation SKEdgeView
+
+- (void)viewDidMoveToWindow {
+    [self setEdges:[[self window] styleMask] == NSBorderlessWindowMask ? 
BDSKNoEdgeMask : BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
+}
+
+...@end

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-03-31 21:40:17 UTC (rev 6404)
+++ trunk/SKMainWindowController.m      2010-03-31 21:51:27 UTC (rev 6405)
@@ -349,13 +349,11 @@
         leftSideDrawer = [[NSDrawer alloc] 
initWithContentSize:[leftSideContentView frame].size preferredEdge:NSMinXEdge];
         [leftSideDrawer setParentWindow:[self window]];
         [leftSideDrawer setContentView:leftSideContentView];
-        [leftSideController.edgeView setEdges:BDSKNoEdgeMask];
         [leftSideDrawer openOnEdge:NSMinXEdge];
         [leftSideDrawer setDelegate:self];
         rightSideDrawer = [[NSDrawer alloc] 
initWithContentSize:[rightSideContentView frame].size preferredEdge:NSMaxXEdge];
         [rightSideDrawer setParentWindow:[self window]];
         [rightSideDrawer setContentView:rightSideContentView];
-        [rightSideController.edgeView setEdges:BDSKNoEdgeMask];
         [rightSideDrawer openOnEdge:NSMaxXEdge];
         [rightSideDrawer setDelegate:self];
         [centerContentView setFrame:[splitView bounds]];
@@ -1225,9 +1223,6 @@
         [[leftSideController.view window] makeFirstResponder:nil];
     [leftSideWindow setMainView:leftSideController.view];
     
-    if (mwcFlags.usesDrawers == 0)
-        [leftSideController.edgeView setEdges:BDSKNoEdgeMask];
-    
     if ([self isPresentation]) {
         mwcFlags.savedLeftSidePaneState = [self leftSidePaneState];
         [self setLeftSidePaneState:SKThumbnailSidePaneState];
@@ -1250,9 +1245,6 @@
         [[rightSideController.view window] makeFirstResponder:nil];
     [rightSideWindow setMainView:rightSideController.view];
     
-    if (mwcFlags.usesDrawers == 0)
-        [rightSideController.edgeView setEdges:BDSKNoEdgeMask];
-    
     if ([self isPresentation]) {
         [rightSideWindow setAlphaValue:PRESENTATION_SIDE_WINDOW_ALPHA];
         [rightSideWindow setEnabled:NO];
@@ -1277,10 +1269,6 @@
         [leftSideController.view setFrame:rect];
         [leftSideContentView addSubview:leftSideController.view];
         
-        if (mwcFlags.usesDrawers == 0) {
-            [leftSideController.edgeView setEdges:BDSKMinXEdgeMask | 
BDSKMaxXEdgeMask];
-        }
-        
         if ([self isPresentation]) {
             [self setLeftSidePaneState:mwcFlags.savedLeftSidePaneState];
             [leftSideWindow setAlphaValue:1.0];
@@ -1303,10 +1291,6 @@
         [rightSideController.view setFrame:rect];
         [rightSideContentView addSubview:rightSideController.view];
         
-        if (mwcFlags.usesDrawers == 0) {
-            [rightSideController.edgeView setEdges:BDSKMinXEdgeMask | 
BDSKMaxXEdgeMask];
-        }
-        
         if ([self isPresentation]) {
             [rightSideWindow setAlphaValue:1.0];
             [rightSideWindow setEnabled:YES];

Modified: trunk/SKSideViewController.h
===================================================================
--- trunk/SKSideViewController.h        2010-03-31 21:40:17 UTC (rev 6404)
+++ trunk/SKSideViewController.h        2010-03-31 21:51:27 UTC (rev 6405)
@@ -38,12 +38,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-...@class SKMainWindowController, BDSKEdgeView, BDSKCollapsibleView, 
SKGradientView;
+...@class SKMainWindowController, BDSKCollapsibleView;
 
 @interface SKSideViewController : NSViewController {
-    BDSKEdgeView *edgeView;
     BDSKCollapsibleView *collapsibleView;
-    SKGradientView *gradientView;
     NSSegmentedControl *button;
     NSSegmentedControl *alternateButton;
     NSSearchField *searchField;
@@ -53,9 +51,7 @@
 }
 
 @property (nonatomic, assign) IBOutlet SKMainWindowController *mainController;
-...@property (nonatomic, assign) IBOutlet BDSKEdgeView *edgeView;
 @property (nonatomic, assign) IBOutlet BDSKCollapsibleView *collapsibleView;
-...@property (nonatomic, assign) IBOutlet SKGradientView *gradientView;
 @property (nonatomic, retain) IBOutlet NSSegmentedControl *button;
 @property (nonatomic, retain) IBOutlet NSSegmentedControl *alternateButton;
 @property (nonatomic, assign) IBOutlet NSSearchField *searchField;

Modified: trunk/SKSideViewController.m
===================================================================
--- trunk/SKSideViewController.m        2010-03-31 21:40:17 UTC (rev 6404)
+++ trunk/SKSideViewController.m        2010-03-31 21:51:27 UTC (rev 6405)
@@ -38,9 +38,7 @@
 
 #import "SKSideViewController.h"
 #import "SKPDFToolTipWindow.h"
-#import "BDSKEdgeView.h"
 #import "BDSKCollapsibleView.h"
-#import "SKGradientView.h"
 #import "SKPDFToolTipWindow.h"
 
 #define CONTENTVIEW_KEY @"contentView"
@@ -50,7 +48,7 @@
 
 @implementation SKSideViewController
 
-...@synthesize mainController, edgeView, collapsibleView, gradientView, 
button, alternateButton, searchField, currentView;
+...@synthesize mainController, collapsibleView, button, alternateButton, 
searchField, currentView;
 
 - (void)dealloc {
     mainController = nil;
@@ -64,7 +62,6 @@
     
     [collapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask];
     [collapsibleView setMinSize:NSMakeSize(111.0, NSHeight([collapsibleView 
frame]))];
-    [edgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
 }
 
 #pragma mark View animation

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj        2010-03-31 21:40:17 UTC (rev 
6404)
+++ trunk/Skim.xcodeproj/project.pbxproj        2010-03-31 21:51:27 UTC (rev 
6405)
@@ -292,6 +292,7 @@
                CEF7117F0B90B58F003A2771 /* SKVersionNumber.m in Sources */ = 
{isa = PBXBuildFile; fileRef = CEF7117D0B90B58E003A2771 /* SKVersionNumber.m 
*/; };
                CEF711A10B90B714003A2771 /* 
NSUserDefaultsController_SKExtensions.m in Sources */ = {isa = PBXBuildFile; 
fileRef = CEF711A00B90B714003A2771 /* NSUserDefaultsController_SKExtensions.m 
*/; };
                CEF7175F0B90DF10003A2771 /* SKReleaseNotesController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = CEF7175E0B90DF10003A2771 /* 
SKReleaseNotesController.m */; };
+               CEF98DFC1163F9620087D974 /* SKEdgeView.m in Sources */ = {isa = 
PBXBuildFile; fileRef = CEF98DFB1163F9620087D974 /* SKEdgeView.m */; };
                CEFBC96A103C5CBF00535C74 /* SKFormatCommand.m in Sources */ = 
{isa = PBXBuildFile; fileRef = CEFBC969103C5CBF00535C74 /* SKFormatCommand.m 
*/; };
                CEFC7EDA1137FDE20055D1E2 /* NotesPanel.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = CEFC7ED91137FDE20055D1E2 /* NotesPanel.xib */; };
                CEFD68740C01D4080027B933 /* SkimImporter.mdimporter in Copy 
Files: Spotlight */ = {isa = PBXBuildFile; fileRef = CEFD68690C01D3BB0027B933 
/* SkimImporter.mdimporter */; };
@@ -1166,6 +1167,8 @@
                CEF7175E0B90DF10003A2771 /* SKReleaseNotesController.m */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
SKReleaseNotesController.m; sourceTree = "<group>"; };
                CEF82CC40EC4ADDA009652CF /* libssl.dylib */ = {isa = 
PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = 
libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; };
                CEF82CE50EC4B2FE009652CF /* libcrypto.dylib */ = {isa = 
PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = 
libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
+               CEF98DFA1163F9620087D974 /* SKEdgeView.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
SKEdgeView.h; sourceTree = "<group>"; };
+               CEF98DFB1163F9620087D974 /* SKEdgeView.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKEdgeView.m; sourceTree = "<group>"; };
                CEFBC968103C5CBF00535C74 /* SKFormatCommand.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
SKFormatCommand.h; sourceTree = "<group>"; };
                CEFBC969103C5CBF00535C74 /* SKFormatCommand.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKFormatCommand.m; sourceTree = "<group>"; };
                CEFC7ED91137FDE20055D1E2 /* NotesPanel.xib */ = {isa = 
PBXFileReference; lastKnownFileType = file.xib; path = NotesPanel.xib; 
sourceTree = "<group>"; };
@@ -1615,6 +1618,8 @@
                                CE4D97FB0C3C2BFF002C20CB /* SKColorSwatch.m */,
                                CE3A41560B790C56006B64D3 /* SKDragImageView.h 
*/,
                                CE3A41570B790C56006B64D3 /* SKDragImageView.m 
*/,
+                               CEF98DFA1163F9620087D974 /* SKEdgeView.h */,
+                               CEF98DFB1163F9620087D974 /* SKEdgeView.m */,
                                CECDDBAB0C5BB95F0026AAEC /* SKFindTableView.h 
*/,
                                CECDDBAC0C5BB95F0026AAEC /* SKFindTableView.m 
*/,
                                CECF61FD0DB258D600587D96 /* SKFontWell.h */,
@@ -2529,6 +2534,7 @@
                                CE8BF027115F7C390029020F /* 
SKLeftSideViewController.m in Sources */,
                                CE8BF02A115F7C5C0029020F /* 
SKRightSideViewController.m in Sources */,
                                CE9768831161195C008DCB8F /* 
SKDownloadPreferenceController.m in Sources */,
+                               CEF98DFC1163F9620087D974 /* SKEdgeView.m in 
Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


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

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to