Commit 5de326ba authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne

macosx: fix some issues with playlist column headers

close #6870
(cherry picked from commit 01533a3cb5eece7f3e6638f51415df4909ccb6c7)
Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 93e5cfc7
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
case NSEnterCharacter: case NSEnterCharacter:
case NSCarriageReturnCharacter: case NSCarriageReturnCharacter:
[(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:self]; [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] playItem:nil];
break; break;
default: default:
...@@ -788,6 +788,10 @@ ...@@ -788,6 +788,10 @@
playlist_item_t *p_item; playlist_item_t *p_item;
playlist_item_t *p_node = NULL; 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]; p_item = [[o_outline_view itemAtRow:[o_outline_view selectedRow]] pointerValue];
PL_LOCK; PL_LOCK;
...@@ -1315,7 +1319,7 @@ ...@@ -1315,7 +1319,7 @@
/* Check whether the selected table column header corresponds to a /* Check whether the selected table column header corresponds to a
sortable table column*/ 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; return;
} }
...@@ -1337,6 +1341,10 @@ ...@@ -1337,6 +1341,10 @@
{ {
i_mode = SORT_ARTIST; i_mode = SORT_ARTIST;
} }
else if( o_tc == o_tc_duration )
{
i_mode = SORT_DURATION;
}
if( b_isSortDescending ) if( b_isSortDescending )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment