colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-14 14:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup of CPSegmentedControl.j

Browse Source
This commit is contained in:
Saikat Chakrabarti
2014-02-20 17:30:28 -08:00
parent 7eb35ef33d
commit 883c4a185d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPSegmentedControl.j
+1 -6
View File
@@ -646,8 +646,7 @@ CPSegmentSwitchTrackingMomentary = 2;
borderState = (borderState.hasThemeState(CPThemeStateSelected) && !borderState.hasThemeState(CPThemeStateHighlighted)) ? CPThemeStateSelected : CPThemeStateNormal;
if (_themeState.hasThemeState(CPThemeStateDisabled))
borderState = CPThemeState(borderState, CPThemeStateDisabled);
borderState = isDisabled ? CPThemeState(borderState, CPThemeStateDisabled) : borderState;
var borderColor = [self valueForThemeAttribute:@"divider-bezel-color"
inState:borderState],
@@ -916,15 +915,11 @@ var CPSegmentedControlSegmentsKey = "CPSegmentedControlSegmentsKey",
// HACK
for (var i = 0; i < _segments.length; i++)
{
_themeStates[i] = [_segments[i] selected] ? CPThemeStateSelected : CPThemeStateNormal;
}
// We do this in a second loop because it relies on all the themeStates being set first
for (var i = 0; i < _segments.length; i++)
{
[self tileWithChangedSegment:i];
}
var difference = MAX(originalWidth - [self frame].size.width, 0.0),
remainingWidth = FLOOR(difference / _segments.length);