Revision: 2984
http://skim-app.svn.sourceforge.net/skim-app/?rev=2984&view=rev
Author: hofman
Date: 2007-09-24 12:42:03 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
Automatically hide gradients depending on the window's style mask, rather than
setting an ivar.
Modified Paths:
--------------
trunk/BDSKGradientView.h
trunk/BDSKGradientView.m
trunk/SKMainWindowController.m
Modified: trunk/BDSKGradientView.h
===================================================================
--- trunk/BDSKGradientView.h 2007-09-23 12:53:33 UTC (rev 2983)
+++ trunk/BDSKGradientView.h 2007-09-24 19:42:03 UTC (rev 2984)
@@ -44,7 +44,6 @@
@private
CIColor *startColor;
CIColor *endColor;
- BOOL drawsGradient;
}
- (void)setLowerColor:(NSColor *)color;
@@ -54,7 +53,4 @@
- (CIColor *)lowerColor;
- (CIColor *)upperColor;
-- (BOOL)drawsGradient;
-- (void)setDrawsGradient:(BOOL)flag;
-
@end
Modified: trunk/BDSKGradientView.m
===================================================================
--- trunk/BDSKGradientView.m 2007-09-23 12:53:33 UTC (rev 2983)
+++ trunk/BDSKGradientView.m 2007-09-24 19:42:03 UTC (rev 2984)
@@ -52,7 +52,6 @@
{
self = [super initWithFrame:frame];
[self setDefaultColors];
- drawsGradient = YES;
return self;
}
@@ -66,7 +65,7 @@
- (void)drawRect:(NSRect)aRect
{
// fill entire view, not just the (possibly clipped) aRect
- if (drawsGradient)
+ if ([[self window] styleMask] & NSClosableWindowMask)
[[NSBezierPath bezierPathWithRect:[self bounds]]
fillPathVerticallyWithStartColor:[self upperColor] endColor:[self lowerColor]];
}
@@ -86,20 +85,8 @@
- (CIColor *)lowerColor { return endColor; }
- (CIColor *)upperColor { return startColor; }
-- (BOOL)drawsGradient {
- return drawsGradient;
-}
-
-- (void)setDrawsGradient:(BOOL)flag {
- if (drawsGradient != flag) {
- drawsGradient = flag;
- [self setNeedsDisplay:YES];
- }
-}
-
-
// required in order for redisplay to work properly with the controls
-- (BOOL)isOpaque{ return [self drawsGradient]; }
+- (BOOL)isOpaque{ return ([[self window] styleMask] & NSClosableWindowMask)
!= 0; }
- (BOOL)isFlipped { return NO; }
@end
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-23 12:53:33 UTC (rev 2983)
+++ trunk/SKMainWindowController.m 2007-09-24 19:42:03 UTC (rev 2984)
@@ -303,14 +303,12 @@
[leftSideDrawer setParentWindow:[self window]];
[leftSideDrawer setContentView:leftSideContentView];
[leftSideEdgeView setEdges:BDSKNoEdgeMask];
- [leftSideGradientView setDrawsGradient:NO];
[leftSideDrawer openOnEdge:NSMinXEdge];
[leftSideDrawer setDelegate:self];
rightSideDrawer = [[NSDrawer alloc]
initWithContentSize:[rightSideContentView frame].size preferredEdge:NSMaxXEdge];
[rightSideDrawer setParentWindow:[self window]];
[rightSideDrawer setContentView:rightSideContentView];
[rightSideEdgeView setEdges:BDSKNoEdgeMask];
- [rightSideGradientView setDrawsGradient:NO];
[rightSideDrawer openOnEdge:NSMaxXEdge];
[rightSideDrawer setDelegate:self];
[pdfSplitView setFrame:[splitView bounds]];
@@ -2031,7 +2029,6 @@
if (usesDrawers == NO) {
[leftSideEdgeView setEdges:BDSKNoEdgeMask];
- [leftSideGradientView setDrawsGradient:NO];
}
if ([self isPresentation]) {
@@ -2061,7 +2058,6 @@
if (usesDrawers == NO) {
[rightSideEdgeView setEdges:BDSKNoEdgeMask];
- [rightSideGradientView setDrawsGradient:NO];
}
if ([self isPresentation]) {
@@ -2087,7 +2083,6 @@
if (usesDrawers == NO) {
[leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
- [leftSideGradientView setDrawsGradient:YES];
}
if ([self isPresentation]) {
@@ -2110,7 +2105,6 @@
if (usesDrawers == NO) {
[rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask];
- [rightSideGradientView setDrawsGradient:YES];
}
if ([self isPresentation]) {
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
