diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index d83abc5a3..d1bce3c4a 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -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 diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index d092a64ef..4c2af01ea 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -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 diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 951e8f76c..acd843d89 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -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]; } /*! diff --git a/Tests/Manual/TableTest/DragAndDrop/AppController.j b/Tests/Manual/TableTest/DragAndDrop/AppController.j index 56464a735..d9ae3d92d 100644 --- a/Tests/Manual/TableTest/DragAndDrop/AppController.j +++ b/Tests/Manual/TableTest/DragAndDrop/AppController.j @@ -152,6 +152,11 @@ TableTestDragAndDropTableViewDataType = @"TableTestDragAndDropTableViewDataType" return YES; } +- (void)tableView:(CPTableView)aTableView didDragTableColumn:(CPTableColumn)aTableColumn +{ + CPLog.debug(_cmd + aTableColumn); +} + @end diff --git a/Tests/Manual/TableTest/ViewBasedCib/AppController.j b/Tests/Manual/TableTest/ViewBasedCib/AppController.j index 53e6fabe2..2461331c1 100644 --- a/Tests/Manual/TableTest/ViewBasedCib/AppController.j +++ b/Tests/Manual/TableTest/ViewBasedCib/AppController.j @@ -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 {