Revision: 13782
http://sourceforge.net/p/skim-app/code/13782
Author: hofman
Date: 2023-11-19 18:19:20 +0000 (Sun, 19 Nov 2023)
Log Message:
-----------
get backing scale factor from window
Modified Paths:
--------------
trunk/NSView_SKExtensions.h
trunk/NSView_SKExtensions.m
trunk/PDFView_SKExtensions.m
trunk/SKColorSwatch.m
trunk/SKDragImageView.m
trunk/SKLoupeController.m
trunk/SKPDFView.m
Modified: trunk/NSView_SKExtensions.h
===================================================================
--- trunk/NSView_SKExtensions.h 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/NSView_SKExtensions.h 2023-11-19 18:19:20 UTC (rev 13782)
@@ -49,8 +49,6 @@
- (SKFontWell *)activeFontWell;
-- (CGFloat)backingScale;
-
- (NSRect)convertRectToScreen:(NSRect)rect;
- (NSRect)convertRectFromScreen:(NSRect)rect;
- (NSPoint)convertPointToScreen:(NSPoint)point;
Modified: trunk/NSView_SKExtensions.m
===================================================================
--- trunk/NSView_SKExtensions.m 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/NSView_SKExtensions.m 2023-11-19 18:19:20 UTC (rev 13782)
@@ -73,10 +73,6 @@
return nil;
}
-- (CGFloat)backingScale {
- return [self convertSizeToBacking:NSMakeSize(1.0, 1.0)].width;
-}
-
- (NSRect)convertRectToScreen:(NSRect)rect {
return [[self window] convertRectToScreen:[self convertRect:rect
toView:nil]];
}
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/PDFView_SKExtensions.m 2023-11-19 18:19:20 UTC (rev 13782)
@@ -205,7 +205,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 backingScale] drawingHandler:^(NSRect rect){
+ NSImage *dragImage = [NSImage bitmapImageWithSize:NSMakeSize(32.0, 32.0)
scale:[[self window] backingScaleFactor] 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 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/SKColorSwatch.m 2023-11-19 18:19:20 UTC (rev 13782)
@@ -382,7 +382,7 @@
if (@available(macOS 11.0, *))
r = 2.5;
- NSImage *image = [NSImage
bitmapImageWithSize:NSMakeSize(12.0, 12.0) scale:[self backingScale]
drawingHandler:^(NSRect rect){
+ NSImage *image = [NSImage
bitmapImageWithSize:NSMakeSize(12.0, 12.0) scale:[[self window]
backingScaleFactor] 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 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/SKDragImageView.m 2023-11-19 18:19:20 UTC (rev 13782)
@@ -39,7 +39,6 @@
#import "SKDragImageView.h"
#import "NSMenu_SKExtensions.h"
#import "NSEvent_SKExtensions.h"
-#import "NSView_SKExtensions.h"
#import "NSImage_SKExtensions.h"
#import "NSBitmapImageRep_SKExtensions.h"
@@ -124,7 +123,7 @@
if (object) {
NSRect bounds = [self bounds];
- CGFloat scale = [self backingScale];
+ CGFloat scale = [[self window] backingScaleFactor];
NSImage *dragImage = [NSImage
bitmapImageWithSize:bounds.size scale:scale drawingHandler:^(NSRect rect){
[[self cell] drawInteriorWithFrame:rect
inView:self];
Modified: trunk/SKLoupeController.m
===================================================================
--- trunk/SKLoupeController.m 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/SKLoupeController.m 2023-11-19 18:19:20 UTC (rev 13782)
@@ -274,7 +274,7 @@
CGInterpolationQuality interpolation = [pdfView interpolationQuality] + 1;
PDFDisplayBox box = [pdfView displayBox];
NSRect scaledRect = NSMakeRect(mouseLoc.x + (NSMinX(magRect) - mouseLoc.x)
/ magnification, mouseLoc.y + (NSMinY(magRect) - mouseLoc.y) / magnification,
NSWidth(magRect) / magnification, NSHeight(magRect) / magnification);
- CGFloat backingScale = [pdfView backingScale];
+ CGFloat backingScale = [window backingScaleFactor];
NSRange pageRange;
if ([pdfView displaysRTL] && ([pdfView displayMode] & kPDFDisplayTwoUp)) {
pageRange.location = [[pdfView
pageForPoint:SKTopRightPoint(scaledRect) nearest:YES] pageIndex];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2023-11-19 18:07:23 UTC (rev 13781)
+++ trunk/SKPDFView.m 2023-11-19 18:19:20 UTC (rev 13782)
@@ -1166,7 +1166,7 @@
interval = PACER_LINE_HEIGHT / pacerSpeed;
selector = @selector(pacerMoveReadingBar:);
} else {
- interval = 1.0 / (pacerSpeed * [self backingScale] * [self
scaleFactor]);
+ interval = 1.0 / (pacerSpeed * [([self window] ?: (NSWindow
*)[NSScreen mainScreen]) backingScaleFactor] * [self scaleFactor]);
selector = @selector(pacerScroll:);
}
pacerTimer = [[NSTimer scheduledTimerWithTimeInterval:interval
target:self selector:selector userInfo:nil repeats:YES] retain];
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
