From 49c8a02b5fc5f6e2926aa3f47c0281fd51fd6022 Mon Sep 17 00:00:00 2001 From: Klaas Pieter Annema Date: Fri, 22 Oct 2010 13:55:37 +0200 Subject: [PATCH] cleanup in CPSplitView and the Aristo ThemeDescriptors --- AppKit/CPSplitView.j | 27 ++++++++++++------------- AppKit/Themes/Aristo/ThemeDescriptors.j | 12 +++++------ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/AppKit/CPSplitView.j b/AppKit/CPSplitView.j index f360a7752..c23a66373 100644 --- a/AppKit/CPSplitView.j +++ b/AppKit/CPSplitView.j @@ -163,7 +163,7 @@ var CPSplitViewHorizontalImage = nil, _isPaneSplitter = shouldBePaneSplitter; - if(_DOMDividerElements[_drawingDivider]) + if (_DOMDividerElements[_drawingDivider]) [self _setupDOMDivider]; // The divider changes size when pane splitter mode is toggled, so the @@ -197,9 +197,8 @@ var CPSplitViewHorizontalImage = nil, - (CGRect)effectiveRectOfDividerAtIndex:(int)aDivider { - var realRect = [self rectOfDividerAtIndex:aDivider]; - - var padding = 2; + var realRect = [self rectOfDividerAtIndex:aDivider], + padding = 2; realRect.size[_sizeComponent] += padding * 2; realRect.origin[_originComponent] -= padding; @@ -315,9 +314,9 @@ var CPSplitViewHorizontalImage = nil, if ([self isHidden] || ![self hitTests] || !CGRectContainsPoint([self frame], aPoint)) return nil; - var point = [self convertPoint:aPoint fromView:[self superview]]; + var point = [self convertPoint:aPoint fromView:[self superview]], + count = [_subviews count] - 1; - var count = [_subviews count] - 1; for (var i = 0; i < count; i++) { if ([self cursorAtPoint:point hitDividerAtIndex:i]) @@ -374,9 +373,9 @@ var CPSplitViewHorizontalImage = nil, else [self setPosition:minPosition ofDividerAtIndex:i]; } - else if ([_delegate splitView:self canCollapseSubview:_subviews[i+1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i+1] forDoubleClickOnDividerAtIndex:i]) + else if ([_delegate splitView:self canCollapseSubview:_subviews[i + 1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i]) { - if ([self isSubviewCollapsed:_subviews[i+1]]) + if ([self isSubviewCollapsed:_subviews[i + 1]]) [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i]; else [self setPosition:maxPosition ofDividerAtIndex:i]; @@ -458,8 +457,8 @@ var CPSplitViewHorizontalImage = nil, var frame = [_subviews[i] frame], size = frame.size[_sizeComponent], startPosition = frame.origin[_originComponent] + size, - canShrink = [self _realPositionForPosition:startPosition-1 ofDividerAtIndex:i] < startPosition, - canGrow = [self _realPositionForPosition:startPosition+1 ofDividerAtIndex:i] > startPosition, + canShrink = [self _realPositionForPosition:startPosition - 1 ofDividerAtIndex:i] < startPosition, + canGrow = [self _realPositionForPosition:startPosition + 1 ofDividerAtIndex:i] > startPosition, cursor = [CPCursor arrowCursor]; if (size === 0) @@ -523,10 +522,10 @@ var CPSplitViewHorizontalImage = nil, actualMax = proposedMax, actualMin = proposedMin; - if([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)]) + if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)]) actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex]; - if([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)]) + if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)]) actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex]; var viewA = _subviews[dividerIndex], @@ -617,8 +616,8 @@ var CPSplitViewHorizontalImage = nil, var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0, remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent], - oldDimension = (oldSize[_sizeComponent]- totalDividers*dividerThickness - nonSizableSpace), - ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers*dividerThickness - nonSizableSpace) / oldDimension; + oldDimension = (oldSize[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace), + ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace) / oldDimension; for (index = 0; index < count; ++index) { diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 4894d8eb3..d82c4c2a6 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -739,12 +739,12 @@ var themedButtonValues = nil, [@"text-color", [CPColor whiteColor], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView], [@"font", [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateSelectedTableDataView], - [@"text-color", [CPColor colorWithCalibratedWhite:125.0 / 255.0 alpha:1.0], CPThemeStateTableDataView|CPThemeStateGroupRow], - [@"text-color", [CPColor colorWithCalibratedWhite:1.0 alpha:1.0], CPThemeStateTableDataView|CPThemeStateGroupRow|CPThemeStateSelectedTableDataView], - [@"text-shadow-color", [CPColor whiteColor], CPThemeStateTableDataView|CPThemeStateGroupRow], - [@"text-shadow-offset", CGSizeMake(0,1), CPThemeStateTableDataView|CPThemeStateGroupRow], - [@"text-shadow-color", [CPColor colorWithCalibratedWhite:0.0 alpha:0.6], CPThemeStateTableDataView|CPThemeStateGroupRow|CPThemeStateSelectedTableDataView], - [@"font", [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView|CPThemeStateGroupRow] + [@"text-color", [CPColor colorWithCalibratedWhite:125.0 / 255.0 alpha:1.0], CPThemeStateTableDataView | CPThemeStateGroupRow], + [@"text-color", [CPColor colorWithCalibratedWhite:1.0 alpha:1.0], CPThemeStateTableDataView | CPThemeStateGroupRow | CPThemeStateSelectedTableDataView], + [@"text-shadow-color", [CPColor whiteColor], CPThemeStateTableDataView | CPThemeStateGroupRow], + [@"text-shadow-offset", CGSizeMake(0,1), CPThemeStateTableDataView | CPThemeStateGroupRow], + [@"text-shadow-color", [CPColor colorWithCalibratedWhite:0.0 alpha:0.6], CPThemeStateTableDataView | CPThemeStateGroupRow | CPThemeStateSelectedTableDataView], + [@"font", [CPFont boldSystemFontOfSize:12.0], CPThemeStateTableDataView | CPThemeStateGroupRow] ]; [self registerThemeValues:themedTextFieldValues forView:textfield];