From 7692f80f6402238d4704faecf39d6a0fbabe1907 Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Fri, 17 Sep 2010 16:48:00 -0400 Subject: [PATCH] Additional fixes of inadvertent globals. --- AppKit/CPScroller.j | 118 ++++++++++++++++++------------------- AppKit/CPTableHeaderView.j | 24 ++++---- Foundation/CPUndoManager.j | 10 ++-- 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index 41e320255..85b75943c 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -41,9 +41,9 @@ CPNoScrollerParts = 0; CPOnlyScrollerArrows = 1; CPAllScrollerParts = 2; -/*! +/*! @ingroup appkit - @class CPScroller + @class CPScroller */ var PARTS_ARRANGEMENT = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob], @@ -107,7 +107,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; [self setFloatValue:0.0]; [self setKnobProportion:1.0]; - + _hitPart = CPScrollerNoPart; [self _calculateIsVertical]; @@ -181,10 +181,10 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; - (id)currentValueForThemeAttribute:(CPString)anAttributeName { var themeState = _themeState; - + if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName) themeState &= ~CPThemeStateHighlighted; - + return [self valueForThemeAttribute:anAttributeName inState:themeState]; } @@ -206,25 +206,25 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; - (CPScrollerPart)testPart:(CGPoint)aPoint { aPoint = [self convertPoint:aPoint fromView:nil]; - - // The ordering of these tests is important. We check the knob and + + // The ordering of these tests is important. We check the knob and // page rects first since they may overlap with the arrows. - + if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint)) return CPScrollerKnob; - + if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementPage], aPoint)) return CPScrollerDecrementPage; - + if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementPage], aPoint)) return CPScrollerIncrementPage; - + if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementLine], aPoint)) return CPScrollerDecrementLine; - + if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementLine], aPoint)) return CPScrollerIncrementLine; - + if (CGRectContainsPoint([self rectForPart:CPScrollerKnobSlot], aPoint)) return CPScrollerKnobSlot; @@ -242,7 +242,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; if (_knobProportion === 1.0) { _usableParts = CPNoScrollerParts; - + _partRects[CPScrollerDecrementPage] = CGRectMakeZero(); _partRects[CPScrollerKnob] = CGRectMakeZero(); _partRects[CPScrollerIncrementPage] = CGRectMakeZero(); @@ -251,7 +251,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; // In this case, the slot is the entirety of the scroller. _partRects[CPScrollerKnobSlot] = CGRectMakeCopy(bounds); - + return; } @@ -261,8 +261,8 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; var knobInset = [self currentValueForThemeAttribute:@"knob-inset"], trackInset = [self currentValueForThemeAttribute:@"track-inset"], width = _CGRectGetWidth(bounds), - height = _CGRectGetHeight(bounds); - + height = _CGRectGetHeight(bounds); + if ([self isVertical]) { var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"], @@ -281,10 +281,10 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; _partRects[CPScrollerKnobSlot] = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight); _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height); _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height); - + if(height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom) _partRects[CPScrollerKnob] = _CGRectMakeZero(); - + if(height < decrementLineSize.height + incrementLineSize.height - 2) { _partRects[CPScrollerIncrementLine] = _CGRectMakeZero(); @@ -310,10 +310,10 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; _partRects[CPScrollerKnobSlot] = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, height - trackInset.top - trackInset.bottom); _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height); _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height); - + if(width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right) _partRects[CPScrollerKnob] = _CGRectMakeZero(); - + if(width < decrementLineSize.width + incrementLineSize.width - 2) { _partRects[CPScrollerIncrementLine] = _CGRectMakeZero(); @@ -359,9 +359,9 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; - (CPView)createViewForPart:(CPScrollerPart)aPart { var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()]; - + [view setHitTests:NO]; - + return view; } @@ -375,7 +375,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()]; [view setHitTests:NO]; - + return view; } @@ -389,12 +389,12 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; for (; index < count; ++index) { var part = PARTS_ARRANGEMENT[index]; - + if (index === 0) view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowBelow relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index + 1]]; else view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowAbove relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index - 1]]; - + if (view) [view setBackgroundColor:[self currentValueForThemeAttribute:NAMES_FOR_PARTS[part] + "-color"]]; } @@ -404,7 +404,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; Caches images for the scroll arrow and knob. */ - (void)drawParts -{ +{ [self drawKnobSlot]; [self drawKnob]; [self drawArrow:CPScrollerDecrementArrow highlight:NO]; @@ -427,37 +427,37 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; - (void)trackKnob:(CPEvent)anEvent { var type = [anEvent type]; - + if (type === CPLeftMouseUp) { _hitPart = CPScrollerNoPart; - + return; } - + if (type === CPLeftMouseDown) { _trackingFloatValue = [self floatValue]; _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil]; } - + else if (type === CPLeftMouseDragged) { var knobRect = [self rectForPart:CPScrollerKnob], knobSlotRect = [self rectForPart:CPScrollerKnobSlot], remainder = ![self isVertical] ? (_CGRectGetWidth(knobSlotRect) - _CGRectGetWidth(knobRect)) : (_CGRectGetHeight(knobSlotRect) - _CGRectGetHeight(knobRect)); - + if (remainder <= 0) [self setFloatValue:0.0]; else { - var location = [self convertPoint:[anEvent locationInWindow] fromView:nil]; + var location = [self convertPoint:[anEvent locationInWindow] fromView:nil], delta = ![self isVertical] ? location.x - _trackingStartPoint.x : location.y - _trackingStartPoint.y; [self setFloatValue:_trackingFloatValue + delta / remainder]; } } - + [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES]; [self sendAction:[self action] to:[self target]]; @@ -475,26 +475,26 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; { [self highlight:NO]; [CPEvent stopPeriodicEvents]; - + _hitPart = CPScrollerNoPart; - + return; } - + if (type === CPLeftMouseDown) { _trackingPart = [self hitPart]; - + _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil]; if ([anEvent modifierFlags] & CPAlternateKeyMask) { if (_trackingPart == CPScrollerDecrementLine) _hitPart = CPScrollerDecrementPage; - + else if (_trackingPart == CPScrollerIncrementLine) _hitPart = CPScrollerIncrementPage; - + else if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage) { var knobRect = [self rectForPart:CPScrollerKnob], @@ -503,42 +503,42 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; remainder = (![self isVertical] ? _CGRectGetWidth(knobSlotRect) : _CGRectGetHeight(knobSlotRect)) - knobWidth; [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - _CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - _CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder]; - + _hitPart = CPScrollerKnob; - - [self sendAction:[self action] to:[self target]]; - + + [self sendAction:[self action] to:[self target]]; + // Now just track the knob. return [self trackKnob:anEvent]; } } - + [self highlight:YES]; [self sendAction:[self action] to:[self target]]; - + [CPEvent startPeriodicEventsAfterDelay:0.5 withPeriod:0.04]; } - + else if (type === CPLeftMouseDragged) { _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil]; - + if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage) { var hitPart = [self testPart:[anEvent locationInWindow]]; - + if (hitPart == CPScrollerDecrementPage || hitPart == CPScrollerIncrementPage) { _trackingPart = hitPart; _hitPart = hitPart; } } - + [self highlight:CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint)]; } else if (type == CPPeriodic && CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint)) [self sendAction:[self action] to:[self target]]; - + [CPApp setTarget:self selector:@selector(trackScrollButtons:) forNextEventMatchingMask:CPPeriodicMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES]; } @@ -570,15 +570,15 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; { if (![self isEnabled]) return; - + _hitPart = [self testPart:[anEvent locationInWindow]]; - + switch (_hitPart) { case CPScrollerKnob: return [self trackKnob:anEvent]; - - case CPScrollerDecrementLine: - case CPScrollerIncrementLine: + + case CPScrollerDecrementLine: + case CPScrollerIncrementLine: case CPScrollerDecrementPage: case CPScrollerIncrementPage: return [self trackScrollButtons:anEvent]; } @@ -604,7 +604,7 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize", _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey]; _partRects = []; - + _hitPart = CPScrollerNoPart; [self _calculateIsVertical]; @@ -622,14 +622,14 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize", [self setFrame:frame]; } - + return self; } - (void)encodeWithCoder:(CPCoder)aCoder { [super encodeWithCoder:aCoder]; - + [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey]; [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey]; } diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index 540b3824d..5656e83b7 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -25,7 +25,7 @@ @import "CPView.j" #include "CoreGraphics/CGGeometry.h" - + @implementation _CPTableColumnHeaderView : CPView { _CPImageAndTextView _textField; @@ -240,7 +240,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal rect.origin.x = _CGRectGetMaxX(rect) - 5; rect.size.width = 20; - return rect; + return rect; } - (void)_setPressedColumn:(CPInteger)column @@ -249,7 +249,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal { var headerView = [_tableView._tableColumns[_pressedColumn] headerView]; [headerView unsetThemeState:CPThemeStateHighlighted]; - } + } if (column != -1) { @@ -353,7 +353,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal viewLocation.x = ( _CGRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x ); viewLocation.y = _CGRectGetMinY(columnRect) + offset.y; - [self dragView:view at:viewLocation offset:_CGSizeMakeZero() event:[CPApp currentEvent] + [self dragView:view at:viewLocation offset:_CGSizeMakeZero() event:[CPApp currentEvent] pasteboard:[CPPasteboard pasteboardWithName:CPDragPboard] source:self slideBack:YES]; return NO; @@ -364,7 +364,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal - (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint { - return _isTrackingColumn && _activeColumn === aColumnIndex && + return _isTrackingColumn && _activeColumn === aColumnIndex && _CGRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint); } @@ -398,8 +398,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal - (void)_constrainDragView:(CPView)theDragView at:(CGPoint)aPoint { var tableColumns = [_tableView tableColumns], - lastColumnRect = [self _headerRectOfLastVisibleColumn]; - activeColumnRect = [self headerRectOfColumn:_activeColumn]; + lastColumnRect = [self _headerRectOfLastVisibleColumn], + activeColumnRect = [self headerRectOfColumn:_activeColumn], dragWindow = [theDragView window], frame = [dragWindow frame]; @@ -547,7 +547,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal return; } - var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil], + var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil], mouseOverLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y), overColumn = [self columnAtPoint:mouseOverLocation]; @@ -568,7 +568,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal } - (void)mouseEntered:(CPEvent)theEvent -{ +{ [self _updateResizeCursor:theEvent]; } @@ -586,16 +586,16 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal - (void)layoutSubviews { var tableColumns = [_tableView tableColumns], - count = [tableColumns count]; + count = [tableColumns count]; - for (var i = 0; i < count; i++) + for (var i = 0; i < count; i++) { var column = [tableColumns objectAtIndex:i], headerView = [column headerView]; var frame = [self headerRectOfColumn:i]; frame.size.height -= 0.5; - if (i > 0) + if (i > 0) { frame.origin.x += 0.5; frame.size.width -= 1; diff --git a/Foundation/CPUndoManager.j b/Foundation/CPUndoManager.j index eb5f0f548..7b7a46240 100644 --- a/Foundation/CPUndoManager.j +++ b/Foundation/CPUndoManager.j @@ -740,13 +740,13 @@ if (_currentGroup == nil) @end var CPUndoManagerRedoStackKey = @"CPUndoManagerRedoStackKey", - CPUndoManagerUndoStackKey = @"CPUndoManagerUndoStackKey"; + CPUndoManagerUndoStackKey = @"CPUndoManagerUndoStackKey", - CPUndoManagerLevelsOfUndoKey = @"CPUndoManagerLevelsOfUndoKey"; - CPUndoManagerActionNameKey = @"CPUndoManagerActionNameKey"; - CPUndoManagerCurrentGroupingKey = @"CPUndoManagerCurrentGroupingKey"; + CPUndoManagerLevelsOfUndoKey = @"CPUndoManagerLevelsOfUndoKey", + CPUndoManagerActionNameKey = @"CPUndoManagerActionNameKey", + CPUndoManagerCurrentGroupingKey = @"CPUndoManagerCurrentGroupingKey", - CPUndoManagerRunLoopModesKey = @"CPUndoManagerRunLoopModesKey"; + CPUndoManagerRunLoopModesKey = @"CPUndoManagerRunLoopModesKey", CPUndoManagerGroupsByEventKey = @"CPUndoManagerGroupsByEventKey"; @implementation CPUndoManager (CPCoding)