Revision: 5104
http://skim-app.svn.sourceforge.net/skim-app/?rev=5104&view=rev
Author: hofman
Date: 2009-01-05 15:22:24 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
Set interior color from Favorite Colors when holding Option key.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2009-01-05 15:01:14 UTC (rev 5103)
+++ trunk/SKMainWindowController.m 2009-01-05 15:22:24 UTC (rev 5104)
@@ -1203,10 +1203,15 @@
- (IBAction)selectColor:(id)sender{
PDFAnnotation *annotation = [pdfView activeAnnotation];
if ([annotation isSkimNote]) {
- NSColor *color = [annotation color];
+ BOOL isFill = (GetCurrentKeyModifiers() & optionKey) != 0 &&
[annotation respondsToSelector:@selector(setInteriorColor:)];
+ NSColor *color = (isFill ? [(id)annotation interiorColor] :
[annotation color]) ?: [NSColor clearColor];
NSColor *newColor = [sender
respondsToSelector:@selector(representedObject)] ? [sender representedObject] :
[sender respondsToSelector:@selector(color)] ? [sender color] : nil;
- if (newColor && [color isEqual:newColor] == NO)
- [annotation setColor:newColor];
+ if (newColor && [color isEqual:newColor] == NO) {
+ if (isFill)
+ [(id)annotation setInteriorColor:newColor];
+ else
+ [annotation setColor:newColor];
+ }
}
}
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
