Revision: 12128
http://sourceforge.net/p/skim-app/code/12128
Author: hofman
Date: 2021-02-26 16:38:27 +0000 (Fri, 26 Feb 2021)
Log Message:
-----------
get scale for image tooltip in tables by reference from delegate
Modified Paths:
--------------
trunk/SKMainWindowController_UI.m
trunk/SKOutlineView.h
trunk/SKOutlineView.m
trunk/SKPresentationOptionsSheetController.m
trunk/SKTableView.h
trunk/SKTableView.m
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2021-02-26 15:53:34 UTC (rev 12127)
+++ trunk/SKMainWindowController_UI.m 2021-02-26 16:38:27 UTC (rev 12128)
@@ -586,13 +586,16 @@
}
}
-- (id <SKImageToolTipContext>)tableView:(NSTableView *)tv
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
- if (tableColumn)
+- (id <SKImageToolTipContext>)tableView:(NSTableView *)tv
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
scale:(CGFloat *)scale {
+ if (tableColumn) {
return nil;
- else if ([tv isEqual:leftSideController.findTableView])
+ } else if ([tv isEqual:leftSideController.findTableView]) {
+ *scale = [[self pdfView] scaleFactor];
return [[leftSideController.findArrayController arrangedObjects]
objectAtIndex:row];
- else if ([tv isEqual:leftSideController.groupedFindTableView])
+ } else if ([tv isEqual:leftSideController.groupedFindTableView]) {
+ *scale = [[self pdfView] scaleFactor];
return [[leftSideController.groupedFindArrayController
arrangedObjects] objectAtIndex:row];
+ }
return nil;
}
@@ -924,9 +927,11 @@
return NO;
}
-- (id <SKImageToolTipContext>)outlineView:(NSOutlineView *)ov
imageContextForItem:(id)item {
- if ([ov isEqual:leftSideController.tocOutlineView])
+- (id <SKImageToolTipContext>)outlineView:(NSOutlineView *)ov
imageContextForItem:(id)item scale:(CGFloat *)scale {
+ if ([ov isEqual:leftSideController.tocOutlineView]) {
+ *scale = [[self pdfView] scaleFactor];
return [item destination];
+ }
return nil;
}
Modified: trunk/SKOutlineView.h
===================================================================
--- trunk/SKOutlineView.h 2021-02-26 15:53:34 UTC (rev 12127)
+++ trunk/SKOutlineView.h 2021-02-26 16:38:27 UTC (rev 12128)
@@ -86,7 +86,7 @@
- (void)outlineView:(NSOutlineView *)anOutlineView
pasteFromPasteboard:(NSPasteboard *)pboard;
- (BOOL)outlineView:(NSOutlineView *)anOutlineView
canPasteFromPasteboard:(NSPasteboard *)pboard;
-- (id <SKImageToolTipContext>)outlineView:(NSOutlineView *)anOutlineView
imageContextForItem:(id)item;
+- (id <SKImageToolTipContext>)outlineView:(NSOutlineView *)anOutlineView
imageContextForItem:(id)item scale:(CGFloat *)scale;
- (NSArray *)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)aTypeSelectHelper;
- (void)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper
didFailToFindMatchForSearchString:(NSString *)searchString;
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2021-02-26 15:53:34 UTC (rev 12127)
+++ trunk/SKOutlineView.m 2021-02-26 16:38:27 UTC (rev 12128)
@@ -306,7 +306,7 @@
}
- (void)addTrackingAreasIfNeeded {
- if ([self hasImageToolTips] && [[self delegate]
respondsToSelector:@selector(outlineView:imageContextForItem:)])
+ if ([self hasImageToolTips] && [[self delegate]
respondsToSelector:@selector(outlineView:imageContextForItem:scale:)])
[self enumerateAvailableRowViewsUsingBlock:^(NSTableRowView *rowView,
NSInteger row){
[self addTrackingAreaForRowView:rowView];
}];
@@ -313,7 +313,7 @@
}
- (void)removeTrackingAreasIfNeeded {
- if ([self hasImageToolTips] && [[self delegate]
respondsToSelector:@selector(outlineView:imageContextForItem:)])
+ if ([self hasImageToolTips] && [[self delegate]
respondsToSelector:@selector(outlineView:imageContextForItem:scale:)])
[self enumerateAvailableRowViewsUsingBlock:^(NSTableRowView *rowView,
NSInteger row){
[self removeTrackingAreaForRowView:rowView];
}];
@@ -321,7 +321,7 @@
- (void)didAddRowView:(NSTableRowView *)rowView forRow:(NSInteger)row {
[super didAddRowView:rowView forRow:row];
- if ([self hasImageToolTips] && [[self delegate]
respondsToSelector:@selector(outlineView:imageContextForItem:)])
+ if ([self hasImageToolTips] && [[self delegate]
respondsToSelector:@selector(outlineView:imageContextForItem:scale:)])
[self addTrackingAreaForRowView:rowView];
}
@@ -347,9 +347,10 @@
if (row != -1) {
id item = [self itemAtRow:row];
if (item) {
- id <SKImageToolTipContext> context = [[self delegate]
outlineView:self imageContextForItem:item];
+ CGFloat scale = 1.0;
+ id <SKImageToolTipContext> context = [[self delegate]
outlineView:self imageContextForItem:item scale:&scale];
if (context)
- [[SKImageToolTipWindow sharedToolTipWindow]
showForImageContext:context scale:1.0 atPoint:NSZeroPoint];
+ [[SKImageToolTipWindow sharedToolTipWindow]
showForImageContext:context scale:scale atPoint:NSZeroPoint];
}
}
return;
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2021-02-26 15:53:34 UTC
(rev 12127)
+++ trunk/SKPresentationOptionsSheetController.m 2021-02-26 16:38:27 UTC
(rev 12128)
@@ -474,7 +474,7 @@
return [tv makeViewWithIdentifier:[tableColumn identifier] owner:self];
}
-- (id <SKImageToolTipContext>)tableView:(NSTableView *)tv
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+- (id <SKImageToolTipContext>)tableView:(NSTableView *)tv
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
scale:(CGFloat *)scale {
if ([[tableColumn identifier] isEqualToString:IMAGE_COLUMNID])
return [[controller pdfDocument] pageAtIndex:row];
else if ([[tableColumn identifier] isEqualToString:TOIMAGE_COLUMNID])
Modified: trunk/SKTableView.h
===================================================================
--- trunk/SKTableView.h 2021-02-26 15:53:34 UTC (rev 12127)
+++ trunk/SKTableView.h 2021-02-26 16:38:27 UTC (rev 12128)
@@ -98,7 +98,7 @@
- (BOOL)tableView:(NSTableView *)tableView
commandSelectRow:(NSInteger)rowIndex;
-- (id <SKImageToolTipContext>)tableView:(NSTableView *)aTableView
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex;
+- (id <SKImageToolTipContext>)tableView:(NSTableView *)aTableView
imageContextForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
scale:(CGFloat *)scale;
- (NSArray *)tableView:(NSTableView *)aTableView
typeSelectHelperSelectionStrings:(SKTypeSelectHelper *)aTypeSelectHelper;
- (void)tableView:(NSTableView *)aTableView
typeSelectHelper:(SKTypeSelectHelper *)aTypeSelectHelper
didFailToFindMatchForSearchString:(NSString *)searchString;
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2021-02-26 15:53:34 UTC (rev 12127)
+++ trunk/SKTableView.m 2021-02-26 16:38:27 UTC (rev 12128)
@@ -274,11 +274,11 @@
#pragma mark Tracking
- (BOOL)hasRowImageToolTips {
- return [self imageToolTipLayout] == SKTableImageToolTipByRow && [[self
delegate]
respondsToSelector:@selector(tableView:imageContextForTableColumn:row:)];
+ return [self imageToolTipLayout] == SKTableImageToolTipByRow && [[self
delegate]
respondsToSelector:@selector(tableView:imageContextForTableColumn:row:scale:)];
}
- (BOOL)hasCellImageToolTips {
- return [self imageToolTipLayout] == SKTableImageToolTipByCell && [[self
delegate]
respondsToSelector:@selector(tableView:imageContextForTableColumn:row:)];
+ return [self imageToolTipLayout] == SKTableImageToolTipByCell && [[self
delegate]
respondsToSelector:@selector(tableView:imageContextForTableColumn:row:scale:)];
}
- (void)addTrackingAreaForRowView:(NSTableRowView *)rowView {
@@ -351,15 +351,16 @@
NSInteger row = [self rowForView:rowView];
if (row != -1) {
id <SKImageToolTipContext> context = nil;
+ CGFloat scale = 1.0;
NSNumber *colNum = [[[theEvent trackingArea] userInfo]
objectForKey:SKImageToolTipColumnKey];
if (colNum) {
NSTableColumn *tableColumn = [[self tableColumns]
objectAtIndex:[colNum integerValue]];
- context = [[self delegate] tableView:self
imageContextForTableColumn:tableColumn row:row];
+ context = [[self delegate] tableView:self
imageContextForTableColumn:tableColumn row:row scale:&scale];
} else {
- context = [[self delegate] tableView:self
imageContextForTableColumn:nil row:row];
+ context = [[self delegate] tableView:self
imageContextForTableColumn:nil row:row scale:&scale];
}
if (context)
- [[SKImageToolTipWindow sharedToolTipWindow]
showForImageContext:context scale:1.0 atPoint:NSZeroPoint];
+ [[SKImageToolTipWindow sharedToolTipWindow]
showForImageContext:context scale:scale atPoint:NSZeroPoint];
}
return;
}
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
