Revision: 6973
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6973&view=rev
Author:   hofman
Date:     2010-12-14 10:39:19 +0000 (Tue, 14 Dec 2010)

Log Message:
-----------
set color of joined markup note

Modified Paths:
--------------
    trunk/SKPDFView.m

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2010-12-14 10:31:38 UTC (rev 6972)
+++ trunk/SKPDFView.m   2010-12-14 10:39:19 UTC (rev 6973)
@@ -3202,12 +3202,12 @@
                 PDFSelection *sel = [(PDFAnnotationMarkup *)activeAnnotation 
selection];
                 [sel addSelection:[(PDFAnnotationMarkup *)newActiveAnnotation 
selection]];
                 
-                [self removeActiveAnnotation:nil];
                 [self removeAnnotation:newActiveAnnotation];
-                
                 newActiveAnnotation = [[[PDFAnnotationMarkup alloc] 
initSkimNoteWithSelection:sel markupType:markupType] autorelease];
                 [newActiveAnnotation setString:[sel cleanedString]];
+                [newActiveAnnotation setColor:[activeAnnotation color]];
                 [newActiveAnnotation registerUserName];
+                [self removeActiveAnnotation:nil];
                 [self addAnnotation:newActiveAnnotation toPage:page];
                 [[self undoManager] setActionName:NSLocalizedString(@"Join 
Notes", @"Undo action name")];
             } else if ([[activeAnnotation type] isEqualToString:SKNInkString]) 
{
@@ -3227,11 +3227,11 @@
                 
                 [self removeAnnotation:newActiveAnnotation];
                 newActiveAnnotation = [[[PDFAnnotationInk alloc] 
initSkimNoteWithPaths:paths] autorelease];
-                [(PDFAnnotationInk *)newActiveAnnotation 
setString:[activeAnnotation string]];
-                [(PDFAnnotationInk *)newActiveAnnotation 
setColor:[activeAnnotation color]];
-                [(PDFAnnotationInk *)newActiveAnnotation 
setBorder:[activeAnnotation border]];
+                [newActiveAnnotation setString:[activeAnnotation string]];
+                [newActiveAnnotation setColor:[activeAnnotation color]];
+                [newActiveAnnotation setBorder:[activeAnnotation border]];
+                [newActiveAnnotation registerUserName];
                 [self removeActiveAnnotation:nil];
-                [newActiveAnnotation registerUserName];
                 [self addAnnotation:newActiveAnnotation toPage:page];
                 [[self undoManager] setActionName:NSLocalizedString(@"Join 
Notes", @"Undo action name")];
                 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to