Revision: 7641
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7641&view=rev
Author:   hofman
Date:     2012-02-13 16:22:09 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
clear sort column when command-clicking

Modified Paths:
--------------
    trunk/SKMainWindowController_UI.m
    trunk/SKNotesDocument.m

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2012-02-13 13:04:03 UTC (rev 7640)
+++ trunk/SKMainWindowController_UI.m   2012-02-13 16:22:09 UTC (rev 7641)
@@ -697,6 +697,8 @@
         NSTableColumn *oldTableColumn = [ov highlightedTableColumn];
         NSArray *sortDescriptors = nil;
         BOOL ascending = YES;
+        if ([NSEvent modifierFlags] & NSCommandKeyMask)
+            tableColumn = nil;
         if ([oldTableColumn isEqual:tableColumn]) {
             sortDescriptors = [[rightSideController.noteArrayController 
sortDescriptors] valueForKey:@"reversedSortDescriptor"];
             ascending = [[sortDescriptors lastObject] ascending];
@@ -722,8 +724,9 @@
             [ov setHighlightedTableColumn:tableColumn]; 
         }
         [rightSideController.noteArrayController 
setSortDescriptors:sortDescriptors];
-        [ov setIndicatorImage:[NSImage imageNamed:ascending ? 
@"NSAscendingSortIndicator" : @"NSDescendingSortIndicator"]
-                inTableColumn:tableColumn];
+        if (tableColumn)
+            [ov setIndicatorImage:[NSImage imageNamed:ascending ? 
@"NSAscendingSortIndicator" : @"NSDescendingSortIndicator"]
+                    inTableColumn:tableColumn];
         [ov reloadData];
     }
 }

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2012-02-13 13:04:03 UTC (rev 7640)
+++ trunk/SKNotesDocument.m     2012-02-13 16:22:09 UTC (rev 7641)
@@ -640,6 +640,8 @@
     NSTableColumn *oldTableColumn = [ov highlightedTableColumn];
     NSArray *sortDescriptors = nil;
     BOOL ascending = YES;
+    if ([NSEvent modifierFlags] & NSCommandKeyMask)
+        tableColumn = nil;
     if ([oldTableColumn isEqual:tableColumn]) {
         sortDescriptors = [[arrayController sortDescriptors] 
valueForKey:@"reversedSortDescriptor"];
         ascending = [[sortDescriptors lastObject] ascending];
@@ -668,8 +670,9 @@
         [ov setHighlightedTableColumn:tableColumn]; 
     }
     [arrayController setSortDescriptors:sortDescriptors];
-    [ov setIndicatorImage:[NSImage imageNamed:ascending ? 
@"NSAscendingSortIndicator" : @"NSDescendingSortIndicator"]
-            inTableColumn:tableColumn];
+    if (tableColumn)
+        [ov setIndicatorImage:[NSImage imageNamed:ascending ? 
@"NSAscendingSortIndicator" : @"NSDescendingSortIndicator"]
+                inTableColumn:tableColumn];
     [ov reloadData];
 }
 

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


------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to