[Skim-app-commit] SF.net SVN: skim-app:[16551] trunk/PDFSelection_SKE xtensions.m

[hofman--- via Skim-app-commit]

Revision: 16551
          http://sourceforge.net/p/skim-app/code/16551
Author:   hofman
Date:     2026-09-27 15:45:41 +0000 (Sun, 27 Sep 2026)
Log Message:
-----------
get valid bounds from character ranges for degenerate selection bounds

Modified Paths:
--------------
    trunk/PDFSelection_SKExtensions.m

Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m   2026-09-27 15:36:35 UTC (rev 16550)
+++ trunk/PDFSelection_SKExtensions.m   2026-09-27 15:45:41 UTC (rev 16551)
@@ -253,19 +253,36 @@
 
 - (NSRect)safeBoundsForPage:(PDFPage *)page {
     NSRect rect = [self boundsForPage:page];
-    if (isfinite(NSMinX(rect)) == NO || isfinite(NSMinX(rect)) == NO || 
NSIsEmptyRect(rect)) {
-        // On Tahoe, boundsForPage: can return a degenerate rect
-        // for selections found inside certain table-structured PDFs.
-        // Reconstruct from per-character bounds instead,
-        // which use a different PDFKit code path and are unaffected.
-        NSUInteger firstIndex = [self safeIndexOfFirstCharacterOnPage:page];
-        if (firstIndex != NSNotFound) {
-            rect = [page characterBoundsAtIndex:firstIndex];
-            NSUInteger lastIndex = [self safeIndexOfLastCharacterOnPage:page];
-            if (lastIndex != firstIndex && lastIndex != NSNotFound)
-                rect = NSUnionRect(rect, [page 
characterBoundsAtIndex:lastIndex]);
-            if (isfinite(NSMinX(rect)) == NO || isfinite(NSMinX(rect)) == NO)
-                rect = [page foregroundRect];
+    if (@available(macOS 26.0, *)) {
+        if (isfinite(NSMinX(rect)) == NO || isfinite(NSMinX(rect)) == NO || 
NSIsEmptyRect(rect)) {
+            // On Tahoe, boundsForPage: can return a degenerate rect
+            // for selections found inside certain table-structured PDFs.
+            // Reconstruct from per-character bounds instead,
+            // which use a different PDFKit code path and are unaffected.
+            rect = NSZeroRect;
+            NSUInteger i, iMax = [self numberOfTextRangesOnPage:page];
+            for (i = 0; i < iMax; i++) {
+                NSRange tr = [self rangeAtIndex:i onPage:page];
+                if (tr.length > 0) {
+                    PDFSelection *sub = [page selectionForRange:tr];
+                    if (sub) {
+                        NSRect subRect = [sub boundsForPage:page];
+                        if (isfinite(NSMinX(subRect)) && 
isfinite(NSMinY(subRect)) && NSIsEmptyRect(subRect) == NO)
+                            rect = NSUnionRect(rect, subRect);
+                    }
+                }
+            }
+            if (isfinite(NSMinX(rect)) == NO || isfinite(NSMinX(rect)) == NO 
|| NSIsEmptyRect(rect)) {
+                NSUInteger firstIndex = [self 
safeIndexOfFirstCharacterOnPage:page];
+                if (firstIndex != NSNotFound) {
+                    rect = [page characterBoundsAtIndex:firstIndex];
+                    NSUInteger lastIndex = [self 
safeIndexOfLastCharacterOnPage:page];
+                    if (lastIndex != firstIndex && lastIndex != NSNotFound)
+                        rect = NSUnionRect(rect, [page 
characterBoundsAtIndex:lastIndex]);
+                    if (isfinite(NSMinX(rect)) == NO || isfinite(NSMinX(rect)) 
== NO)
+                        rect = [page foregroundRect];
+                }
+            }
         }
     }
     return rect;

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit