Skip to content

Commit a678801

Browse files
committed
• In the *Find* table results, when using the *View* sort added in version 2.1, it now maintains its order after the content is changed, by deleting a bookmark for example.
1 parent ca594a7 commit a678801

4 files changed

+14
-2
lines changed

Diff for: SSYPopUpTableHeaderCell.h

+2
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,6 @@ typedef enum SSYPopupTableHeaderCellSortState_enum SSYPopupTableHeaderCellSortSt
5858
*/
5959
@property (copy) NSString* fixedNonMenuTitle ;
6060

61+
@property SSYPopupTableHeaderCellSortState sortState ;
62+
6163
@end

Diff for: SSYPopUpTableHeaderCell.m

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#import "SSYPopUpTableHeaderCell.h"
22
#import "NS(Attributed)String+Geometrics.h"
3+
#import "SSYTableHeaderView.h"
34
//BAD:
45
#import "StarkTableColumn.h"
56

@@ -8,7 +9,6 @@ @interface SSYPopUpTableHeaderCell ()
89
@property CGFloat lostWidth ;
910
@property CGFloat sortIndicatorLeftEdge ;
1011
@property (copy) NSString* priorSelectedTitle ;
11-
@property SSYPopupTableHeaderCellSortState sortState ;
1212

1313
@end
1414

@@ -64,7 +64,7 @@ - (void)performClickWithFrame:(NSRect)frame
6464
inView:controlView] ;
6565
}
6666
else {
67-
NSTableView* tableView = [(NSTableHeaderView*)controlView tableView] ;
67+
NSTableView* tableView = [(SSYTableHeaderView*)controlView tableView] ;
6868
NSInteger clickedColumnIndex = [(NSTableHeaderView*)controlView columnAtPoint:point] ;
6969
NSArray <NSTableColumn <SSYPopupTableHeaderSortableColumn>*> * columns = (NSArray <NSTableColumn <SSYPopupTableHeaderSortableColumn>*> *)[tableView tableColumns] ;
7070
NSInteger columnIndex = 0 ;
@@ -75,6 +75,7 @@ - (void)performClickWithFrame:(NSRect)frame
7575
[self setSortState:SSYPopupTableHeaderCellSortStateSortedDescending] ;
7676
if ([tableColumn respondsToSelector:@selector(sortAsAscending:)]) {
7777
[tableColumn sortAsAscending:NO] ;
78+
[(SSYTableHeaderView*)controlView setSortedColumn:tableColumn] ;
7879
}
7980
break ;
8081
case SSYPopupTableHeaderCellSortStateNotSorted:
@@ -83,6 +84,7 @@ - (void)performClickWithFrame:(NSRect)frame
8384
[self setSortState:SSYPopupTableHeaderCellSortStateSortedAscending] ;
8485
if ([tableColumn respondsToSelector:@selector(sortAsAscending:)]) {
8586
[tableColumn sortAsAscending:YES] ;
87+
[(SSYTableHeaderView*)controlView setSortedColumn:tableColumn] ;
8688
}
8789
break ;
8890
}

Diff for: SSYTableHeaderView.h

+2
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@
1818

1919
}
2020

21+
@property (retain) NSTableColumn* sortedColumn ;
22+
2123
@end

Diff for: SSYTableHeaderView.m

+6
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,10 @@ - (void)mouseDown:(NSEvent*)event {
2121
}
2222
}
2323

24+
- (void)dealloc {
25+
[_sortedColumn release] ;
26+
27+
[super dealloc] ;
28+
}
29+
2430
@end

0 commit comments

Comments
 (0)