@@ -185,7 +185,6 @@ var _headerGradient = CGGradientCreateWithColorComponents(CGColorSpaceCreateDevi
}
- (CPRect)_resizeRectBeforeColumn:(CPInteger)column
-<<<<<<< HEAD:AppKit/CPTableHeaderView.j
{
var rect = [self headerRectOfColumn:column];
@@ -221,43 +220,6 @@ var _headerGradient = CGGradientCreateWithColorComponents(CGColorSpaceCreateDevi
- (void)mouseDown:(CPEvent)theEvent
{
-=======
-{
- var rect = [self headerRectOfColumn:column];
-
- rect.origin.x -= 10;
- rect.size.width = 20;
-
- return rect;
-}
-
-- (void)trackResizeWithEvent:(CPEvent)anEvent
-{
- var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
- type = [anEvent type];
-
- if (this.lastLocation == nil) this.lastLocation = location;
-
- if (type === CPLeftMouseUp)
- {
- _resizedColumn = CPNotFound;
- this.lastLocation = nil;
- return;
- }
- else if (type === CPLeftMouseDragged)
- {
- var column = [[_tableView tableColumns] objectAtIndex:_resizedColumn];
- var newWidth = [column width] + location.x - this.lastLocation.x;
- [column setWidth:newWidth];
- this.lastLocation = location;
- }
-
- [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-}
-
-- (void)mouseDown:(CPEvent)theEvent
-{
->>>>>>> tableview-extra:AppKit/CPTableHeaderView.j
var location = [self convertPoint:[theEvent locationInWindow] fromView:nil];
var clickedColumn = [self columnAtPoint:location];
AppKit/CPTableHeaderView.j
e2a506166d9b6ea7707247453cf0679c4dcc1691
cacaodev
cacaodev@gmail.com
http://github.com/cacaodev/cappuccino/commit/9b15a3907595c412b7d4162dc56734a2c531ecae
9b15a3907595c412b7d4162dc56734a2c531ecae
2009-11-04T16:42:58-08:00
2009-11-04T16:42:58-08:00
Fixed conflict in CPTableHeaderView.j
88b5dd04f42d25231ce7e1b0fe1b1c9823aa2b14
cacaodev
cacaodev@gmail.com