Revision: 5376
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5376&view=rev
Author:   hofman
Date:     2009-05-11 22:16:37 +0000 (Mon, 11 May 2009)

Log Message:
-----------
use endcaps as for scrollview in placard views

Modified Paths:
--------------
    trunk/Images/Scroller_Background.tiff
    trunk/NSScrollView_SKExtensions.m

Modified: trunk/Images/Scroller_Background.tiff
===================================================================
(Binary files differ)

Modified: trunk/NSScrollView_SKExtensions.m
===================================================================
--- trunk/NSScrollView_SKExtensions.m   2009-05-11 11:18:17 UTC (rev 5375)
+++ trunk/NSScrollView_SKExtensions.m   2009-05-11 22:16:37 UTC (rev 5376)
@@ -136,20 +136,34 @@
 @implementation BDSKPlacardView
 
 - (void)drawRect:(NSRect)aRect {
-    [self subviews];
     NSImage *bgImage = [NSImage imageNamed:@"Scroller_Background"];
     NSImage *divImage = [NSImage imageNamed:@"Scroller_Divider"];
-    NSRect srcRect = {NSZeroPoint, [bgImage size]};
-    NSRect bounds = [self bounds];
-    NSRect divRect = bounds;
+    NSRect bgSrcRect = {NSZeroPoint, [bgImage size]};
+    NSRect divSrcRect = {NSZeroPoint, [divImage size]};
+    NSRect leftRect, rightRect, leftSrcRect, rightSrcRect, midSrcRect = 
bgSrcRect;
+    NSRect midRect = [self bounds];
+    NSRect divRect = midRect;
+    CGFloat width = NSHeight(bgSrcRect);
+    
     divRect.size.width = 1.0;
-    [bgImage drawInRect:bounds fromRect:srcRect 
operation:NSCompositeSourceOver fraction:1.0];
-    [divImage drawInRect:divRect fromRect:srcRect 
operation:NSCompositeSourceOver fraction:1.0];
+    midSrcRect.origin.x = SKFloor(NSWidth(midSrcRect) / 2.0);
+    midSrcRect.size.width = 1.0;
+    NSDivideRect(bgSrcRect, &rightSrcRect, &bgSrcRect, width, NSMaxXEdge);
+    NSDivideRect(bgSrcRect, &leftSrcRect, &bgSrcRect, width, NSMinXEdge);
+    NSDivideRect(midRect, &rightRect, &midRect, width, NSMaxXEdge);
+    NSDivideRect(midRect, &leftRect, &midRect, width, NSMinXEdge);
+    
+    [bgImage drawInRect:leftRect fromRect:leftSrcRect 
operation:NSCompositeSourceOver fraction:1.0];
+    [bgImage drawInRect:rightRect fromRect:rightSrcRect 
operation:NSCompositeSourceOver fraction:1.0];
+    if (NSWidth(midRect) > 0)
+        [bgImage drawInRect:midRect fromRect:midSrcRect 
operation:NSCompositeSourceOver fraction:1.0];
+    
     NSEnumerator *viewEnum = [[self subviews] objectEnumerator];
-    NSView *view;
+    NSView *view = [viewEnum nextObject];
+    CGFloat f = [[self window] isMainWindow] || [[self window] isKeyWindow] ? 
1.0 : 0.33333;
     while (view = [viewEnum nextObject]) {
-        divRect.origin.x = NSMaxX([view frame]);
-        [divImage drawInRect:divRect fromRect:srcRect 
operation:NSCompositeSourceOver fraction:1.0];
+        divRect.origin.x = NSMinX([view frame]) - 1;
+        [divImage drawInRect:divRect fromRect:divSrcRect 
operation:NSCompositeSourceOver fraction:f];
     }
 }
 


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

------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to