Revision: 6825
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6825&view=rev
Author:   hofman
Date:     2010-09-19 21:04:17 +0000 (Sun, 19 Sep 2010)

Log Message:
-----------
support dropping color on font well

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

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m  2010-09-19 13:11:22 UTC (rev 6824)
+++ trunk/SKFontWell.m  2010-09-19 21:04:17 UTC (rev 6825)
@@ -106,7 +106,7 @@
     [super setAction:@selector(changeActive:)];
     [super setTarget:self];
     bindingInfo = [[NSMutableDictionary alloc] init];
-    [self registerForDraggedTypes:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, nil]];
+    [self registerForDraggedTypes:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, NSColorPboardType, nil]];
 }
 
 - (id)initWithFrame:(NSRect)frame {
@@ -360,7 +360,7 @@
 #pragma mark NSDraggingDestination protocol 
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
-    if ([self isEnabled] && [sender draggingSource] != self && [[sender 
draggingPasteboard] availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, nil]]) {
+    if ([self isEnabled] && [sender draggingSource] != self && [[sender 
draggingPasteboard] availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, ([self hasTextColor] ? NSColorPboardType : 
nil), nil]]) {
         [[self cell] setHighlighted:YES];
         [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
         [self setNeedsDisplay:YES];
@@ -370,7 +370,7 @@
 }
 
 - (void)draggingExited:(id <NSDraggingInfo>)sender {
-    if ([self isEnabled] && [sender draggingSource] != self && [[sender 
draggingPasteboard] availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, nil]]) {
+    if ([self isEnabled] && [sender draggingSource] != self && [[sender 
draggingPasteboard] availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, ([self hasTextColor] ? NSColorPboardType : 
nil), nil]]) {
         [[self cell] setHighlighted:NO];
         [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
         [self setNeedsDisplay:YES];
@@ -378,13 +378,14 @@
 }
 
 - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender {
-    return [self isEnabled] && [sender draggingSource] != self && [[sender 
draggingPasteboard] availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, nil]];
+    return [self isEnabled] && [sender draggingSource] != self && [[sender 
draggingPasteboard] availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, ([self hasTextColor] ? NSColorPboardType : 
nil), nil]];
 } 
 
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender{
     NSPasteboard *pboard = [sender draggingPasteboard];
-    NSString *type = [pboard availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, nil]];
+    NSString *type = [pboard availableTypeFromArray:[NSArray 
arrayWithObjects:SKNSFontPanelDescriptorsPboardType, 
SKNSFontPanelFamiliesPboardType, ([self hasTextColor] ? NSColorPboardType : 
nil), nil]];
     NSFont *droppedFont = nil;
+    NSColor *droppedColor = nil;
     
     @try {
         if ([type isEqualToString:SKNSFontPanelDescriptorsPboardType]) {
@@ -404,6 +405,8 @@
             NSString *family = ([families isKindOfClass:[NSArray class]] && 
[families count]) ? [families objectAtIndex:0] : nil;
             if ([family isKindOfClass:[NSString class]])
                 droppedFont = [[NSFontManager sharedFontManager] 
convertFont:[self font] toFamily:family];
+        } else if ([type isEqualToString:NSColorPboardType]) {
+            droppedColor = [NSColor colorFromPasteboard:pboard];
         }
     }
     @catch (id exception) {
@@ -415,12 +418,17 @@
         [self notifyFontBinding];
         [self sendAction:[self action] to:[self target]];
     }
+    if (droppedColor) {
+        [self setTextColor:droppedColor];
+        [self notifyTextColorBinding];
+        [self sendAction:[self action] to:[self target]];
+    }
     
     [[self cell] setHighlighted:NO];
     [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
     [self setNeedsDisplay:YES];
     
-       return droppedFont != nil;
+       return droppedFont != nil || droppedColor != nil;
 }
 
 @end


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

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to