Merge pull request #2531 from cacaodev/cptableview-diddragcolumn

FIXED: tableView:didDragTableColumn: was never sent
With tests.
Fixes #2530
This commit is contained in:
cacaodev
2017-02-03 08:13:46 +01:00
committed by GitHub
5 changed files with 24 additions and 5 deletions
+8
View File
@@ -537,6 +537,14 @@ CPTableColumnUserResizingMask = 1 << 1;
return _headerToolTip;
}
/*!
@ignore
*/
- (CPString)description
{
return [CPString stringWithFormat:"<%@ 0x%@ identifier=%@>", [self className], [CPString stringWithHash:[self UID]], [self identifier]];
}
@end
@implementation CPTableColumnValueBinder : CPBinder
+4 -3
View File
@@ -681,20 +681,21 @@ var CPTableHeaderViewResizeZone = 3.0,
[_columnDragClipView removeFromSuperview];
[_tableView _setDraggedColumn:-1];
var headerView = [[[_tableView tableColumns] objectAtIndex:aColumnIndex] headerView];
var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
headerView = [tableColumn headerView];
[[headerView subviews] makeObjectsPerformSelector:@selector(setHidden:) withObject:NO];
if (_tableView._draggedColumnIsSelected)
[headerView setThemeState:CPThemeStateSelected];
var columnRect = [_tableView rectOfColumn:aColumnIndex];
[_tableView _reloadDataViews];
[[_tableView headerView] setNeedsLayout];
[[CPCursor arrowCursor] set];
[self updateTrackingAreas];
[_tableView _sendDelegateDidDragTableColumn:tableColumn];
}
- (BOOL)_shouldResizeTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
+2 -2
View File
@@ -5748,10 +5748,10 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
@ignore
Call the delegate didDragTableColumn with the given tableColumn
*/
- (void)_sendDelegateDidDragTableColumn:(CPInteger)column
- (void)_sendDelegateDidDragTableColumn:(CPTableColumn)aTableColumn
{
if (_implementedDelegateMethods & CPTableViewDelegate_tableView_didDragTableColumn_)
[_delegate tableView:self didDragTableColumn:_tableColumns[column]];
[_delegate tableView:self didDragTableColumn:aTableColumn];
}
/*!
@@ -152,6 +152,11 @@ TableTestDragAndDropTableViewDataType = @"TableTestDragAndDropTableViewDataType"
return YES;
}
- (void)tableView:(CPTableView)aTableView didDragTableColumn:(CPTableColumn)aTableColumn
{
CPLog.debug(_cmd + aTableColumn);
}
@end
@@ -203,6 +203,11 @@ CPLogRegister(CPLogConsole)
return [height intValue];
}
- (void)tableView:(CPTableView)aTableView didDragTableColumn:(CPTableColumn)aTableColumn
{
CPLog.debug(_cmd + aTableColumn);
}
// CELL VIEWS ACTIONS
- (IBAction)_sliderAction:(id)sender
{