Revision: 12380 http://sourceforge.net/p/skim-app/code/12380 Author: hofman Date: 2021-06-28 22:44:27 +0000 (Mon, 28 Jun 2021) Log Message: ----------- Use proper and unique local variable names
Modified Paths: -------------- trunk/SKHighlightingTableRowView.m trunk/SKRightSideViewController.m trunk/SKThumbnailPageCell.m trunk/SKThumbnailView.m Modified: trunk/SKHighlightingTableRowView.m =================================================================== --- trunk/SKHighlightingTableRowView.m 2021-06-28 16:47:20 UTC (rev 12379) +++ trunk/SKHighlightingTableRowView.m 2021-06-28 22:44:27 UTC (rev 12380) @@ -61,7 +61,6 @@ - (void)updateHighlightMask { NSRect rect = [self bounds]; if (NSIsEmptyRect(rect) == NO) { - NSRect rect = [self bounds]; NSImage *mask = [[NSImage alloc] initWithSize:rect.size]; if (NSWidth(rect) > 20.0) { [mask lockFocus]; Modified: trunk/SKRightSideViewController.m =================================================================== --- trunk/SKRightSideViewController.m 2021-06-28 16:47:20 UTC (rev 12379) +++ trunk/SKRightSideViewController.m 2021-06-28 22:44:27 UTC (rev 12380) @@ -118,7 +118,8 @@ [noteOutlineView setIndentationPerLevel:1.0]; [noteOutlineView registerForDraggedTypes:[NSColor readableTypesForPasteboard:[NSPasteboard pasteboardWithName:NSDragPboard]]]; - + [noteOutlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:NO]; + [snapshotTableView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:NO]; } Modified: trunk/SKThumbnailPageCell.m =================================================================== --- trunk/SKThumbnailPageCell.m 2021-06-28 16:47:20 UTC (rev 12379) +++ trunk/SKThumbnailPageCell.m 2021-06-28 22:44:27 UTC (rev 12380) @@ -54,7 +54,7 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView { if ([self isMarked]) { NSImage *markImage = [NSImage markImage]; - NSRect rect = NSMakeRect(NSMaxX(cellFrame) - markImage.size.width - MARKIMAGE_OFFSET, [controlView isFlipped] ? NSMinY(rect) + MARKIMAGE_OFFSET : NSMaxY(cellFrame) - markImage.size.height - MARKIMAGE_OFFSET, markImage.size.width, markImage.size.height); + NSRect rect = NSMakeRect(NSMaxX(cellFrame) - markImage.size.width - MARKIMAGE_OFFSET, [controlView isFlipped] ? NSMinY(cellFrame) + MARKIMAGE_OFFSET : NSMaxY(cellFrame) - markImage.size.height - MARKIMAGE_OFFSET, markImage.size.width, markImage.size.height); [markImage drawInRect:rect]; } [super drawWithFrame:cellFrame inView:controlView]; Modified: trunk/SKThumbnailView.m =================================================================== --- trunk/SKThumbnailView.m 2021-06-28 16:47:20 UTC (rev 12379) +++ trunk/SKThumbnailView.m 2021-06-28 22:44:27 UTC (rev 12380) @@ -148,17 +148,17 @@ } - (NSImageView *)newMarkView { - NSImageView *markView = [(SKOverviewView *)[[self controller] collectionView] newViewWithIdentifier:MARK_ID]; - if (markView == nil) { + NSImageView *view = [(SKOverviewView *)[[self controller] collectionView] newViewWithIdentifier:MARK_ID]; + if (view == nil) { NSImage *markImage = [NSImage markImage]; NSRect rect = NSZeroRect; rect.size = markImage.size; - markView = [[NSImageView alloc] initWithFrame:rect]; - [markView setIdentifier:MARK_ID]; - [markView setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin]; - [markView setImage:markImage]; + view = [[NSImageView alloc] initWithFrame:rect]; + [view setIdentifier:MARK_ID]; + [view setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin]; + [view setImage:markImage]; } - return markView; + return view; } - (void)removeView:(id)view { 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