Revision: 14324
http://sourceforge.net/p/skim-app/code/14324
Author: hofman
Date: 2024-06-11 09:26:41 +0000 (Tue, 11 Jun 2024)
Log Message:
-----------
pass view to bitmap image method to get the backing scale factor, we only use
it for dragging images now
Modified Paths:
--------------
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/PDFView_SKExtensions.m
trunk/SKColorSwatch.m
trunk/SKDragImageView.m
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2024-06-11 09:22:34 UTC (rev 14323)
+++ trunk/NSImage_SKExtensions.h 2024-06-11 09:26:41 UTC (rev 14324)
@@ -211,7 +211,7 @@
@interface NSImage (SKExtensions)
-+ (NSImage *)bitmapImageWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
++ (NSImage *)bitmapImageWithSize:(NSSize)size forView:(NSView *)view
drawingHandler:(void (^)(NSRect dstRect))drawingHandler;
+ (NSImage *)imageWithSize:(NSSize)size drawingHandler:(BOOL (^)(NSRect
dstRect))drawingHandler;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2024-06-11 09:22:34 UTC (rev 14323)
+++ trunk/NSImage_SKExtensions.m 2024-06-11 09:26:41 UTC (rev 14324)
@@ -265,9 +265,9 @@
@implementation NSImage (SKExtensions)
-+ (NSImage *)bitmapImageWithSize:(NSSize)size scale:(CGFloat)scale
drawingHandler:(void (^)(NSRect dstRect))drawingHandler {
++ (NSImage *)bitmapImageWithSize:(NSSize)size forView:(NSView *)view
drawingHandler:(void (^)(NSRect dstRect))drawingHandler {
NSImage *image = [[NSImage alloc] initWithSize:size];
- [image addRepresentation:[NSBitmapImageRep imageRepWithSize:size
scale:scale drawingHandler:drawingHandler]];
+ [image addRepresentation:[NSBitmapImageRep imageRepWithSize:size
scale:[[view window] backingScaleFactor] drawingHandler:drawingHandler]];
return image;
}
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2024-06-11 09:22:34 UTC (rev 14323)
+++ trunk/PDFView_SKExtensions.m 2024-06-11 09:26:41 UTC (rev 14324)
@@ -206,7 +206,7 @@
if (page == nil || NSPointInRect(point, [[self currentSelection]
boundsForPage:page]) == NO || [NSApp willDragMouse] == NO)
return NO;
- NSImage *dragImage = [NSImage bitmapImageWithSize:NSMakeSize(32.0, 32.0)
scale:[[self window] backingScaleFactor] drawingHandler:^(NSRect rect){
+ NSImage *dragImage = [NSImage bitmapImageWithSize:NSMakeSize(32.0, 32.0)
forView:self drawingHandler:^(NSRect rect){
[[[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kClippingTextType)] drawInRect:rect
fromRect:rect operation:NSCompositingOperationCopy fraction:1.0
respectFlipped:YES hints:nil];
}];
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2024-06-11 09:22:34 UTC (rev 14323)
+++ trunk/SKColorSwatch.m 2024-06-11 09:26:41 UTC (rev 14324)
@@ -369,7 +369,7 @@
if (@available(macOS 11.0, *))
r = 2.5;
- NSImage *image = [NSImage
bitmapImageWithSize:NSMakeSize(12.0, 12.0) scale:[[self window]
backingScaleFactor] drawingHandler:^(NSRect rect){
+ NSImage *image = [NSImage
bitmapImageWithSize:NSMakeSize(12.0, 12.0) forView:self drawingHandler:^(NSRect
rect){
[color drawSwatchInRect:NSInsetRect(rect, 1.0, 1.0)];
[[NSColor blackColor] set];
[NSBezierPath setDefaultLineWidth:1.0];
Modified: trunk/SKDragImageView.m
===================================================================
--- trunk/SKDragImageView.m 2024-06-11 09:22:34 UTC (rev 14323)
+++ trunk/SKDragImageView.m 2024-06-11 09:26:41 UTC (rev 14324)
@@ -123,9 +123,8 @@
if (object) {
NSRect bounds = [self bounds];
- CGFloat scale = [[self window] backingScaleFactor];
- NSImage *dragImage = [NSImage
bitmapImageWithSize:bounds.size scale:scale drawingHandler:^(NSRect rect){
+ NSImage *dragImage = [NSImage
bitmapImageWithSize:bounds.size forView:self drawingHandler:^(NSRect rect){
[[self cell] drawInteriorWithFrame:rect
inView:self];
}];
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
