Revision: 15773
http://sourceforge.net/p/skim-app/code/15773
Author: hofman
Date: 2025-11-08 18:25:50 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
we never call splitview delegate method with nil
Modified Paths:
--------------
trunk/NSGeometry_SKExtensions.h
trunk/NSGeometry_SKExtensions.m
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/NSGeometry_SKExtensions.h 2025-11-08 18:25:50 UTC (rev 15773)
@@ -41,12 +41,11 @@
NS_ASSUME_NONNULL_BEGIN
typedef NS_OPTIONS(NSUInteger, SKRectEdges) {
- SKNoEdgeMask = 0,
- SKMinXEdgeMask = 1 << NSMinXEdge,
- SKMinYEdgeMask = 1 << NSMinYEdge,
- SKMaxXEdgeMask = 1 << NSMaxXEdge,
- SKMaxYEdgeMask = 1 << NSMaxYEdge,
- SKEveryEdgeMask = SKMinXEdgeMask | SKMinYEdgeMask | SKMaxXEdgeMask |
SKMaxYEdgeMask,
+ SKRectEdgesNone = 0,
+ SKRectEdgesMinX = 1 << NSMinXEdge,
+ SKRectEdgesMinY = 1 << NSMinYEdge,
+ SKRectEdgesMaxX = 1 << NSMaxXEdge,
+ SKRectEdgesMaxY = 1 << NSMaxYEdge,
};
static inline NSPoint SKIntegralPoint(NSPoint point) {
Modified: trunk/NSGeometry_SKExtensions.m
===================================================================
--- trunk/NSGeometry_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/NSGeometry_SKExtensions.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -106,23 +106,23 @@
SKRectEdges SKResizeHandleForPointFromRect(NSPoint point, NSRect rect, CGFloat
delta) {
if (NSPointInRect(point, NSInsetRect(rect, -delta, -delta)) == NO)
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMinY(rect), delta))
- return SKMaxXEdgeMask | SKMinYEdgeMask;
+ return SKRectEdgesMaxX | SKRectEdgesMinY;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMaxY(rect), delta))
- return SKMaxXEdgeMask | SKMaxYEdgeMask;
+ return SKRectEdgesMaxX | SKRectEdgesMaxY;
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMinY(rect), delta))
- return SKMinXEdgeMask | SKMinYEdgeMask;
+ return SKRectEdgesMinX | SKRectEdgesMinY;
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMaxY(rect), delta))
- return SKMinXEdgeMask | SKMaxYEdgeMask;
+ return SKRectEdgesMinX | SKRectEdgesMaxY;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMidY(rect), delta))
- return SKMaxXEdgeMask;
+ return SKRectEdgesMaxX;
else if (SKPointNearCoordinates(point, NSMidX(rect), NSMinY(rect), delta))
- return SKMinYEdgeMask;
+ return SKRectEdgesMinY;
else if (SKPointNearCoordinates(point, NSMidX(rect), NSMaxY(rect), delta))
- return SKMaxYEdgeMask;
+ return SKRectEdgesMaxY;
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMidY(rect), delta))
- return SKMinXEdgeMask;
+ return SKRectEdgesMinX;
else
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
}
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2025-11-08 17:07:13 UTC (rev
15772)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2025-11-08 18:25:50 UTC (rev
15773)
@@ -151,15 +151,15 @@
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point
scaleFactor:(CGFloat)scaleFactor {
if ([self isResizable] == NO)
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
NSSize size = SKMakeSquareSize(8.0 / scaleFactor);
point = SKSubstractPoints(point, [self bounds].origin);
if (NSPointInRect(point, SKRectFromCenterAndSize([self endPoint], size)))
- return SKMaxXEdgeMask;
+ return SKRectEdgesMaxX;
else if (NSPointInRect(point, SKRectFromCenterAndSize([self startPoint],
size)))
- return SKMinXEdgeMask;
+ return SKRectEdgesMinX;
else
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
}
- (void)drawSelectionHighlightWithUnitWidth:(CGFloat)unitWidth
active:(BOOL)active inContext:(CGContextRef)context {
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/PDFAnnotation_SKExtensions.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -467,7 +467,7 @@
}
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point
scaleFactor:(CGFloat)scaleFactor {
- return [self isResizable] ? SKResizeHandleForPointFromRect(point, [self
bounds], 4.0 / scaleFactor) : SKNoEdgeMask;
+ return [self isResizable] ? SKResizeHandleForPointFromRect(point, [self
bounds], 4.0 / scaleFactor) : SKRectEdgesNone;
}
- (void)drawSelectionHighlightWithUnitWidth:(CGFloat)unitWidth
active:(BOOL)active inContext:(CGContextRef)context {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/SKMainWindowController_UI.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -1731,7 +1731,7 @@
- (void)splitViewDidResizeSubviews:(NSNotification *)notification {
id sender = [notification object];
- if (([sender isEqual:splitView] || sender == nil) && [[self window]
frameAutosaveName] && mwcFlags.settingUpWindow == 0) {
+ if ([sender isEqual:splitView] && [[self window] frameAutosaveName] &&
mwcFlags.settingUpWindow == 0) {
CGFloat leftWidth = [splitView isSubviewCollapsed:leftSideContentView]
? 0.0 : NSWidth([leftSideContentView frame]);
CGFloat rightWidth = [splitView
isSubviewCollapsed:rightSideContentView] ? 0.0 : NSWidth([rightSideContentView
frame]);
[[NSUserDefaults standardUserDefaults] setFloat:leftWidth
forKey:SKLeftSidePaneWidthKey];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/SKPDFView.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -3892,13 +3892,13 @@
if (ratio <= 0.0) {
- if ((resizeHandle & SKMaxXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxX)) {
newBounds.size.width += relPoint.x;
if (NSMaxX(newBounds) > NSMaxX(pageBounds))
newBounds.size.width = NSMaxX(pageBounds) - NSMinX(newBounds);
if (NSWidth(newBounds) < minSize)
newBounds.size.width = minSize;
- } else if ((resizeHandle & SKMinXEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinX)) {
newBounds.origin.x += relPoint.x;
newBounds.size.width -= relPoint.x;
if (NSMinX(newBounds) < NSMinX(pageBounds)) {
@@ -3910,13 +3910,13 @@
newBounds.size.width = minSize;
}
}
- if ((resizeHandle & SKMaxYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxY)) {
newBounds.size.height += relPoint.y;
if (NSMaxY(newBounds) > NSMaxY(pageBounds))
newBounds.size.height = NSMaxY(pageBounds) - NSMinY(newBounds);
if (NSHeight(newBounds) < minSize)
newBounds.size.height = minSize;
- } else if ((resizeHandle & SKMinYEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinY)) {
newBounds.origin.y += relPoint.y;
newBounds.size.height -= relPoint.y;
if (NSMinY(newBounds) < NSMinY(pageBounds)) {
@@ -3935,22 +3935,22 @@
CGFloat height = NSHeight(newBounds);
CGFloat ds = 2.0 * margin;
- if ((resizeHandle & SKMaxXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxX))
width = fmax(minSize, width + relPoint.x);
- else if ((resizeHandle & SKMinXEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinX))
width = fmax(minSize, width - relPoint.x);
- if ((resizeHandle & SKMaxYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxY))
height = fmax(minSize, height + relPoint.y);
- else if ((resizeHandle & SKMinYEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinY))
height = fmax(minSize, height - relPoint.y);
- if ((resizeHandle & (SKMinXEdgeMask | SKMaxXEdgeMask)) == 0) {
+ if ((resizeHandle & (SKRectEdgesMinX | SKRectEdgesMaxX)) == 0) {
width = ds + (height - ds) * ratio;
if (width < minSize) {
width = minSize;
height = ds + (width - ds) / ratio;
}
- } else if ((resizeHandle & (SKMinYEdgeMask | SKMaxYEdgeMask)) == 0) {
+ } else if ((resizeHandle & (SKRectEdgesMinY | SKRectEdgesMaxY)) == 0) {
height = ds + (width - ds) / ratio;
if (height < minSize) {
height = minSize;
@@ -3961,7 +3961,7 @@
height = ds + (width - ds) / ratio;
}
- if ((resizeHandle & SKMinXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinX)) {
if (NSMaxX(newBounds) - width < NSMinX(pageBounds)) {
width = fmax(minSize, NSMaxX(newBounds) - NSMinX(pageBounds));
height = ds + (width - ds) / ratio;
@@ -3972,7 +3972,7 @@
height = ds + (width - ds) / ratio;
}
}
- if ((resizeHandle & SKMinYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinY)) {
if (NSMaxY(newBounds) - height < NSMinY(pageBounds)) {
height = fmax(minSize, NSMaxY(newBounds) - NSMinY(pageBounds));
width = ds + (height - ds) * ratio;
@@ -3984,9 +3984,9 @@
}
}
- if ((resizeHandle & SKMinXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinX))
newBounds.origin.x = NSMaxX(newBounds) - width;
- if ((resizeHandle & SKMinYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinY))
newBounds.origin.y = NSMaxY(newBounds) - height;
newBounds.size.width = width;
newBounds.size.height = height;
@@ -4046,14 +4046,14 @@
originalBounds =
SKRectFromCenterAndSquareSize(SKIntegralPoint(initialPoint), 0.0);
if (noteType == SKNoteTypeAnchored) {
[self addAnnotationWithType:SKNoteTypeAnchored selection:nil
page:page bounds:originalBounds];
- resizeHandle = SKNoEdgeMask;
+ resizeHandle = SKRectEdgesNone;
originalBounds = [[self currentAnnotation] bounds];
} else if (noteType == SKNoteTypeLine) {
isLine = YES;
- resizeHandle = SKMaxXEdgeMask;
+ resizeHandle = SKRectEdgesMaxX;
originalStartPoint = originalEndPoint = originalBounds.origin;
} else {
- resizeHandle = SKMaxXEdgeMask | SKMinYEdgeMask;
+ resizeHandle = SKRectEdgesMaxX | SKRectEdgesMinY;
}
} else if (isLine) {
originalStartPoint = SKIntegralPoint(SKAddPoints([currentAnnotation
startPoint], originalBounds.origin));
@@ -4069,7 +4069,7 @@
NSUInteger eventMask = NSEventMaskLeftMouseUp |
NSEventMaskLeftMouseDragged;
[self
setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
[[NSCursor closedHandCursor] push];
[NSEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
eventMask |= NSEventMaskPeriodic;
@@ -4090,7 +4090,7 @@
draggedAnnotation = YES;
}
mousePoint = [theEvent locationInView:self];
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
lastMouseEvent = theEvent;
[[[self scrollView] contentView] autoscroll:lastMouseEvent];
}
@@ -4099,16 +4099,16 @@
continue;
}
BOOL shiftDown = ([theEvent modifierFlags] & NSEventModifierFlagShift)
!= 0;
- if (resizeHandle == SKNoEdgeMask)
+ if (resizeHandle == SKRectEdgesNone)
page = [self pageForPoint:mousePoint nearest:YES];
NSPoint draggedPoint = SKSubstractPoints([self convertPoint:mousePoint
toPage:page], initialPoint);
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
[self moveAnnotationToPoint:draggedPoint onPage:page];
} else if (isLine) {
- [self dragLineAnnotationStartPoint:(resizeHandle & SKMinXEdgeMask)
!= 0 by:draggedPoint originalStartPoint:originalStartPoint
originalEndPoint:originalEndPoint shiftDown:shiftDown];
+ [self dragLineAnnotationStartPoint:(resizeHandle &
SKRectEdgesMinX) != 0 by:draggedPoint originalStartPoint:originalStartPoint
originalEndPoint:originalEndPoint shiftDown:shiftDown];
} else {
if (shouldAddAnnotation) {
- SKRectEdges currentResizeHandle = (draggedPoint.x < 0.0 ?
SKMinXEdgeMask : SKMaxXEdgeMask) | (draggedPoint.y <= 0.0 ? SKMinYEdgeMask :
SKMaxYEdgeMask);
+ SKRectEdges currentResizeHandle = (draggedPoint.x < 0.0 ?
SKRectEdgesMinX : SKRectEdgesMaxX) | (draggedPoint.y <= 0.0 ? SKRectEdgesMinY :
SKRectEdgesMaxY);
if (currentResizeHandle != resizeHandle) {
resizeHandle = currentResizeHandle;
[self
setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
@@ -4129,7 +4129,7 @@
[[highlightLayerController layer] setNeedsDisplay];
}
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
[NSEvent stopPeriodicEvents];
[NSCursor pop];
}
@@ -4415,14 +4415,14 @@
BOOL didSelect = (NO == NSIsEmptyRect(selectionRect));
- SKRectEdges resizeHandle = didSelect ?
SKResizeHandleForPointFromRect(initialPoint, selectionRect, margin) :
SKNoEdgeMask;
+ SKRectEdges resizeHandle = didSelect ?
SKResizeHandleForPointFromRect(initialPoint, selectionRect, margin) :
SKRectEdgesNone;
initialPoint = SKIntegralPoint(initialPoint);
- if (resizeHandle == SKNoEdgeMask && (didSelect == NO ||
NSPointInRect(initialPoint, selectionRect) == NO)) {
+ if (resizeHandle == SKRectEdgesNone && (didSelect == NO ||
NSPointInRect(initialPoint, selectionRect) == NO)) {
selectionRect.origin = initialPoint;
selectionRect.size = NSZeroSize;
- resizeHandle = SKMaxXEdgeMask | SKMinYEdgeMask;
+ resizeHandle = SKRectEdgesMaxX | SKRectEdgesMinY;
if (didSelect)
[self setNeedsDisplay:YES];
}
@@ -4448,15 +4448,15 @@
delta = SKSubstractPoints(newPoint, initialPoint);
if (resizeHandle) {
- SKRectEdges newEffectiveResizeHandle = SKNoEdgeMask;
- if ((resizeHandle & SKMaxXEdgeMask))
- newEffectiveResizeHandle |= newPoint.x < NSMinX(initialRect) ?
SKMinXEdgeMask : SKMaxXEdgeMask;
- else if ((resizeHandle & SKMinXEdgeMask))
- newEffectiveResizeHandle |= newPoint.x > NSMaxX(initialRect) ?
SKMaxXEdgeMask : SKMinXEdgeMask;
- if ((resizeHandle & SKMaxYEdgeMask))
- newEffectiveResizeHandle |= newPoint.y < NSMinY(initialRect) ?
SKMinYEdgeMask : SKMaxYEdgeMask;
- else if ((resizeHandle & SKMinYEdgeMask))
- newEffectiveResizeHandle |= newPoint.y > NSMaxY(initialRect) ?
SKMaxYEdgeMask : SKMinYEdgeMask;
+ SKRectEdges newEffectiveResizeHandle = SKRectEdgesNone;
+ if ((resizeHandle & SKRectEdgesMaxX))
+ newEffectiveResizeHandle |= newPoint.x < NSMinX(initialRect) ?
SKRectEdgesMinX : SKRectEdgesMaxX;
+ else if ((resizeHandle & SKRectEdgesMinX))
+ newEffectiveResizeHandle |= newPoint.x > NSMaxX(initialRect) ?
SKRectEdgesMaxX : SKRectEdgesMinX;
+ if ((resizeHandle & SKRectEdgesMaxY))
+ newEffectiveResizeHandle |= newPoint.y < NSMinY(initialRect) ?
SKRectEdgesMinY : SKRectEdgesMaxY;
+ else if ((resizeHandle & SKRectEdgesMinY))
+ newEffectiveResizeHandle |= newPoint.y > NSMaxY(initialRect) ?
SKRectEdgesMaxY : SKRectEdgesMinY;
if (newEffectiveResizeHandle != effectiveResizeHandle) {
effectiveResizeHandle = newEffectiveResizeHandle;
[self
setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(effectiveResizeHandle,
page)];
@@ -4463,7 +4463,7 @@
}
}
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
newRect.origin = SKAddPoints(newRect.origin, delta);
} else if (([theEvent modifierFlags] & NSEventModifierFlagShift)) {
CGFloat width = NSWidth(newRect);
@@ -4470,23 +4470,23 @@
CGFloat height = NSHeight(newRect);
CGFloat square;
- if ((resizeHandle & SKMaxXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxX))
width += delta.x;
- else if ((resizeHandle & SKMinXEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinX))
width -= delta.x;
- if ((resizeHandle & SKMaxYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxY))
height += delta.y;
- else if ((resizeHandle & SKMinYEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinY))
height -= delta.y;
- if (0 == (resizeHandle & (SKMinXEdgeMask | SKMaxXEdgeMask)))
+ if (0 == (resizeHandle & (SKRectEdgesMinX | SKRectEdgesMaxX)))
square = fabs(height);
- else if (0 == (resizeHandle & (SKMinYEdgeMask | SKMaxYEdgeMask)))
+ else if (0 == (resizeHandle & (SKRectEdgesMinY | SKRectEdgesMaxY)))
square = fabs(width);
else
square = fmax(fabs(width), fabs(height));
- if ((resizeHandle & SKMinXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinX)) {
if (width >= 0.0 && NSMaxX(newRect) - square <
NSMinX(pageBounds))
square = NSMaxX(newRect) - NSMinX(pageBounds);
else if (width < 0.0 && NSMaxX(newRect) + square >
NSMaxX(pageBounds))
@@ -4497,7 +4497,7 @@
else if (width < 0.0 && NSMinX(newRect) - square <
NSMinX(pageBounds))
square = NSMinX(newRect) - NSMinX(pageBounds);
}
- if ((resizeHandle & SKMinYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinY)) {
if (height >= 0.0 && NSMaxY(newRect) - square <
NSMinY(pageBounds))
square = NSMaxY(newRect) - NSMinY(pageBounds);
else if (height < 0.0 && NSMaxY(newRect) + square >
NSMaxY(pageBounds))
@@ -4509,23 +4509,23 @@
square = NSMinY(newRect) - NSMinY(pageBounds);
}
- if ((resizeHandle & SKMinXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinX))
newRect.origin.x = width < 0.0 ? NSMaxX(newRect) :
NSMaxX(newRect) - square;
- else if (width < 0.0 && (resizeHandle & SKMaxXEdgeMask))
+ else if (width < 0.0 && (resizeHandle & SKRectEdgesMaxX))
newRect.origin.x = NSMinX(newRect) - square;
- if ((resizeHandle & SKMinYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinY))
newRect.origin.y = height < 0.0 ? NSMaxY(newRect) :
NSMaxY(newRect) - square;
- else if (height < 0.0 && (resizeHandle & SKMaxYEdgeMask))
+ else if (height < 0.0 && (resizeHandle & SKRectEdgesMaxY))
newRect.origin.y = NSMinY(newRect) - square;
newRect.size.width = newRect.size.height = square;
} else {
- if ((resizeHandle & SKMaxXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxX)) {
newRect.size.width += delta.x;
if (NSWidth(newRect) < 0.0) {
newRect.size.width *= -1.0;
newRect.origin.x -= NSWidth(newRect);
}
- } else if ((resizeHandle & SKMinXEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinX)) {
newRect.origin.x += delta.x;
newRect.size.width -= delta.x;
if (NSWidth(newRect) < 0.0) {
@@ -4534,13 +4534,13 @@
}
}
- if ((resizeHandle & SKMaxYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxY)) {
newRect.size.height += delta.y;
if (NSHeight(newRect) < 0.0) {
newRect.size.height *= -1.0;
newRect.origin.y -= NSHeight(newRect);
}
- } else if ((resizeHandle & SKMinYEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinY)) {
newRect.origin.y += delta.y;
newRect.size.height -= delta.y;
if (NSHeight(newRect) < 0.0) {
@@ -5048,7 +5048,7 @@
area = SKDragArea;
} else {
- SKRectEdges resizeHandle = SKNoEdgeMask;
+ SKRectEdges resizeHandle = SKRectEdgesNone;
PDFPage *page = [self pageAndPoint:&p forEvent:theEvent nearest:YES];
if (readingBar && [[readingBar page] isEqual:page]) {
@@ -5209,13 +5209,13 @@
BOOL rotated = ([page rotation] % 180 != 0);
if (mask == 0)
return SKDragArea;
- else if (mask == SKMaxXEdgeMask || mask == SKMinXEdgeMask)
+ else if (mask == SKRectEdgesMaxX || mask == SKRectEdgesMinX)
return rotated ? SKResizeUpDownArea : SKResizeLeftRightArea;
- else if (mask == (SKMaxXEdgeMask | SKMaxYEdgeMask) || mask ==
(SKMinXEdgeMask | SKMinYEdgeMask))
+ else if (mask == (SKRectEdgesMaxX | SKRectEdgesMaxY) || mask ==
(SKRectEdgesMinX | SKRectEdgesMinY))
return rotated ? SKResizeDiagonal135Area : SKResizeDiagonal45Area;
- else if (mask == SKMaxYEdgeMask || mask == SKMinYEdgeMask)
+ else if (mask == SKRectEdgesMaxY || mask == SKRectEdgesMinY)
return rotated ? SKResizeLeftRightArea : SKResizeUpDownArea;
- else if (mask == (SKMaxXEdgeMask | SKMinYEdgeMask) || mask ==
(SKMinXEdgeMask | SKMaxYEdgeMask))
+ else if (mask == (SKRectEdgesMaxX | SKRectEdgesMinY) || mask ==
(SKRectEdgesMinX | SKRectEdgesMaxY))
return rotated ? SKResizeDiagonal45Area : SKResizeDiagonal135Area;
else
return kPDFNoArea;
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
