[vlc-commits] macosx: fix some issues with playlist column headers

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon May 28 09:32:08 2012 +0200| [5de326ba3c398719a66ef338573367e96d6642e5] | committer: Felix Paul Kühne

macosx: fix some issues with playlist column headers

close #6870
(cherry picked from commit 01533a3cb5eece7f3e6638f51415df4909ccb6c7)

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5de326ba3c398719a66ef338573367e96d6642e5
---

 modules/gui/macosx/playlist.m |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index ea6ee26..82a7fd3 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -85,7 +85,7 @@
 
         case NSEnterCharacter:
         case NSCarriageReturnCharacter:
-            [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self];
+            [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:nil];
             break;
 
         default:
@@ -788,6 +788,10 @@
     playlist_item_t *p_item;
     playlist_item_t *p_node = NULL;
 
+    // ignore clicks on column header when handling double action
+    if( sender != nil && [o_outline_view clickedRow] == -1 )
+        return;
+
     p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
 
     PL_LOCK;
@@ -1315,7 +1319,7 @@
 
     /* Check whether the selected table column header corresponds to a
        sortable table column*/
-    if( !( o_tc == o_tc_name || o_tc == o_tc_author ) )
+    if( !( o_tc == o_tc_name || o_tc == o_tc_author || o_tc == o_tc_duration ) )
     {
         return;
     }
@@ -1337,6 +1341,10 @@
     {
         i_mode = SORT_ARTIST;
     }
+    else if( o_tc == o_tc_duration )
+    {
+        i_mode = SORT_DURATION;
+    }
 
     if( b_isSortDescending )
     {