Revision: 10171
http://sourceforge.net/p/skim-app/code/10171
Author: hofman
Date: 2018-12-23 14:21:31 +0000 (Sun, 23 Dec 2018)
Log Message:
-----------
only draw transparent drag image on 10.6, the system already makes it
transparent, not sure since when
Modified Paths:
--------------
trunk/SKDragImageView.m
trunk/SKLineWell.m
trunk/SKPDFView.m
Modified: trunk/SKDragImageView.m
===================================================================
--- trunk/SKDragImageView.m 2018-12-23 14:14:35 UTC (rev 10170)
+++ trunk/SKDragImageView.m 2018-12-23 14:21:31 UTC (rev 10171)
@@ -139,7 +139,7 @@
}];
NSImage *dragImage = [NSImage
bitmapImageWithSize:bounds.size scale:scale drawingHandler:^(NSRect rect){
- [imageRep drawInRect:rect fromRect:rect
operation:NSCompositeCopy fraction:0.7 respectFlipped:YES hints:nil];
+ [imageRep drawInRect:rect fromRect:rect
operation:NSCompositeCopy fraction:RUNNING_BEFORE(10_7) ? 0.7 : 1.0
respectFlipped:YES hints:nil];
}];
[self dragObject:object withImage:dragImage
fromFrame:bounds forEvent:theEvent];
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2018-12-23 14:14:35 UTC (rev 10170)
+++ trunk/SKLineWell.m 2018-12-23 14:21:31 UTC (rev 10171)
@@ -316,7 +316,6 @@
CGFloat scale = [imageRep pixelsWide] / NSWidth(bounds);
BOOL wasActive = lwFlags.active;
NSColor *borderColor = [NSColor
colorWithCalibratedWhite:SKHasDarkAppearance(NSApp) ? 1.0 : 0.0 alpha:0.6];
- CGFloat fraction = RUNNING_AFTER(10_13) ? 1.0 : 0.7;
lwFlags.active = 0;
[self cacheDisplayInRect:bounds toBitmapImageRep:imageRep];
@@ -328,7 +327,7 @@
[borderColor setStroke];
[NSBezierPath strokeRect:NSInsetRect(rect, 0.5, 0.5)];
rect = NSInsetRect(rect, 1.0, 1.0);
- [imageRep drawInRect:rect fromRect:rect operation:NSCompositeCopy
fraction:fraction respectFlipped:NO hints:nil];
+ [imageRep drawInRect:rect fromRect:rect operation:NSCompositeCopy
fraction:RUNNING_BEFORE(10_7) ? 0.7 : ? 1.0 respectFlipped:NO hints:nil];
}];
return image;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2018-12-23 14:14:35 UTC (rev 10170)
+++ trunk/SKPDFView.m 2018-12-23 14:21:31 UTC (rev 10171)
@@ -4340,7 +4340,7 @@
return NO;
NSImage *dragImage = [NSImage bitmapImageWithSize:NSMakeSize(32.0, 32.0)
scale:[self backingScale] drawingHandler:^(NSRect rect){
- [[[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kClippingTextType)] drawInRect:rect
fromRect:rect operation:NSCompositeCopy fraction:0.9 respectFlipped:YES
hints:nil];
+ [[[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kClippingTextType)] drawInRect:rect
fromRect:rect operation:NSCompositeCopy fraction:RUNNING_BEFORE(10_7) ? 0.8 :
1.0 respectFlipped:YES hints:nil];
}];
NSRect dragFrame = SKRectFromCenterAndSize([theEvent locationInView:self],
[dragImage size]);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
