Revision: 15254 http://sourceforge.net/p/skim-app/code/15254 Author: hofman Date: 2025-05-22 08:55:58 +0000 (Thu, 22 May 2025) Log Message: ----------- rename methods
Modified Paths: -------------- trunk/SKPresentationView.m Modified: trunk/SKPresentationView.m =================================================================== --- trunk/SKPresentationView.m 2025-05-21 21:14:52 UTC (rev 15253) +++ trunk/SKPresentationView.m 2025-05-22 08:55:58 UTC (rev 15254) @@ -418,12 +418,12 @@ - (void)setCursorForMouse:(NSEvent *)theEvent; - (void)setCursorAndAutoHide; -- (void)doAutoHideCursor; -- (void)doAutoHide; +- (void)autoHideCursor; +- (void)autoHide; - (void)showNavWindow; -- (void)doDragWindowWithEvent:(NSEvent *)theEvent; -- (void)doDrawFreehandNoteWithEvent:(NSEvent *)theEvent; +- (void)dragWindowWithEvent:(NSEvent *)theEvent; +- (void)drawFreehandNoteWithEvent:(NSEvent *)theEvent; - (void)showHelpMenu; - (PDFAnnotation *)linkAnotationForMouse:(NSEvent *)theEvent; @@ -796,16 +796,16 @@ } else if (IS_TABLET_EVENT(theEvent, NSPointingDeviceTypePen) == NO && ([[self window] styleMask] & NSWindowStyleMaskResizable) != 0 && NSEqualRects([[self window] frame], [[[self window] screen] frame]) == NO && (pvFlags.enableDrawing == NO || ([theEvent modifierFlags] & NSEventModifierFlagShift) == 0)) { pvFlags.cursorHidden = NO; [[NSCursor closedHandCursor] set]; - [self doDragWindowWithEvent:theEvent]; + [self dragWindowWithEvent:theEvent]; } else if (pvFlags.enableDrawing || IS_TABLET_EVENT(theEvent, NSPointingDeviceTypePen)) { pvFlags.cursorHidden = NO; [[NSCursor arrowCursor] set]; - [self doDrawFreehandNoteWithEvent:theEvent]; + [self drawFreehandNoteWithEvent:theEvent]; } else { [super mouseDown:theEvent]; } if (didHideMouse) { - [self doAutoHideCursor]; + [self autoHideCursor]; } else { [self setCursorAndAutoHide]; } @@ -814,7 +814,7 @@ - (void)mouseMoved:(NSEvent *)theEvent { pvFlags.cursorHidden = NO; [self setCursorForMouse:theEvent]; - [self performSelectorOnce:@selector(doAutoHide) afterDelay:AUTO_HIDE_DELAY]; + [self performSelectorOnce:@selector(autoHide) afterDelay:AUTO_HIDE_DELAY]; if (navigationMode != SKNavigationNone && [navWindow isVisible] == NO) { if (navigationMode == SKNavigationEverywhere && [cursorWindow isVisible] == NO && NSPointInRect([theEvent locationInWindow], [[[self window] contentView] frame])) { @@ -835,7 +835,7 @@ pvFlags.cursorHidden = NO; [self setCursorForMouse:theEvent]; } - [self performSelectorOnce:@selector(doAutoHide) afterDelay:AUTO_HIDE_DELAY]; + [self performSelectorOnce:@selector(autoHide) afterDelay:AUTO_HIDE_DELAY]; [super mouseDragged:theEvent]; } @@ -906,7 +906,7 @@ [super scrollWheel:theEvent]; } -- (void)doDragWindowWithEvent:(NSEvent *)theEvent { +- (void)dragWindowWithEvent:(NSEvent *)theEvent { NSWindow *window = [self window]; NSRect frame = [window frame]; NSPoint offset = SKSubstractPoints(frame.origin, [theEvent locationOnScreen]); @@ -928,7 +928,7 @@ return array; } -- (void)doDrawFreehandNoteWithEvent:(NSEvent *)theEvent { +- (void)drawFreehandNoteWithEvent:(NSEvent *)theEvent { NSRect bounds = [self bounds]; NSRect pageBounds = [page boundsForBox:kPDFDisplayBoxCropBox]; CGFloat scale; @@ -1098,7 +1098,7 @@ - (void)cancelDelayedRequests { [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(showNavWindow) object:nil]; - [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(doAutoHide) object:nil]; + [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(autoHide) object:nil]; } - (void)didOpen { @@ -1111,7 +1111,7 @@ } [self performSelectorOnce:@selector(setCursorForMouse:) afterDelay:0.0]; - [self performSelectorOnce:@selector(doAutoHide) afterDelay:AUTO_HIDE_DELAY]; + [self performSelectorOnce:@selector(autoHide) afterDelay:AUTO_HIDE_DELAY]; } - (void)willClose { @@ -1144,10 +1144,10 @@ - (void)setCursorAndAutoHide { pvFlags.cursorHidden = NO; [self setCursorForMouse:nil]; - [self performSelectorOnce:@selector(doAutoHide) afterDelay:AUTO_HIDE_DELAY]; + [self performSelectorOnce:@selector(autoHide) afterDelay:AUTO_HIDE_DELAY]; } -- (void)doAutoHideCursor { +- (void)autoHideCursor { if ([NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0] == [[self window] windowNumber]) { [[NSCursor emptyCursor] set]; pvFlags.cursorHidden = YES; @@ -1155,9 +1155,9 @@ } } -- (void)doAutoHide { +- (void)autoHide { if (([navWindow isVisible] == NO || NSPointInRect([NSEvent mouseLocation], [navWindow frame]) == NO)) { - [self doAutoHideCursor]; + [self autoHideCursor]; if ([navWindow isVisible]) { [navWindow fadeOut]; NSAccessibilityPostNotificationWithUserInfo(NSAccessibilityUnignoredAncestor(self), NSAccessibilityLayoutChangedNotification, nil); @@ -1193,7 +1193,7 @@ - (void)handleWindowDidBecomeKeyNotification:(NSNotification *)notification { if (pvFlags.cursorHidden == NO) { [self performSelectorOnce:@selector(setCursorForMouse:) afterDelay:0.0]; - [self performSelectorOnce:@selector(doAutoHide) afterDelay:AUTO_HIDE_DELAY]; + [self performSelectorOnce:@selector(autoHide) afterDelay:AUTO_HIDE_DELAY]; } } 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