Fix for track no longer stretching in vertical sliders.

Closes #8. Reviewed by me.
280north · May 1, 2009 · 586a1e3 · 586a1e3
1 parent 08b4bda
commit 586a1e3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/AppKit/CPSlider.j b/AppKit/CPSlider.j
@@ -34,6 +34,8 @@ CPCircularSlider = 1;
     double          _minValue;
     double          _maxValue;
     double          _altIncrementValue;
+
+    BOOL            _isVertical;
 }
 
 + (id)themedAttributes
@@ -54,6 +56,8 @@ CPCircularSlider = 1;
         [self setObjectValue:50.0];
 
         [self setContinuous:YES];
+
+        [self _recalculateIsVertical];
     }
 
     return self;
@@ -226,26 +230,40 @@ CPCircularSlider = 1;
     return _altIncrementValue;
 }
 
-- (int)isVertical
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrameSize:aSize];
+    [self _recalculateIsVertical];
+}
+
+- (void)_recalculateIsVertical
 {
+    // Recalculate isVertical.
     var bounds = [self bounds],
-        width = CGRectGetWidth(bounds),
-        height = CGRectGetHeight(bounds);
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
 
-    return width < height ? 1 : (width > height ? 0 : -1);
+    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
+
+    if (_isVertical === 1)
+        _controlState |= CPControlStateVertical;
+    else if (_isVertical === 0)
+        _controlState &= ~CPControlStateVertical;
+}
+
+- (int)isVertical
+{
+    return _isVertical;
 }
 
 - (void)layoutSubviews
 {
     var trackView = [self layoutEphemeralSubviewNamed:@"track-view"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:@"knob-view"];
-      
+
     if (trackView)
-        if ([self isVertical])
-            [trackView setBackgroundColor:[self currentValueForThemedAttributeName:@"track-color"]];
-        else
-            [trackView setBackgroundColor:[self currentValueForThemedAttributeName:@"track-color"]];
+        [trackView setBackgroundColor:[self currentValueForThemedAttributeName:@"track-color"]];
 
     var knobView = [self layoutEphemeralSubviewNamed:@"knob-view"
                                           positioned:CPWindowAbove
@@ -385,6 +403,8 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
 
         [self setContinuous:YES];
 
+        [self _recalculateIsVertical];
+
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }

diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -339,7 +339,7 @@
         isVertical:YES]];
 
     [slider setValue:5.0 forThemedAttributeName:@"track-width"];
-    [slider setValue:trackColor forThemedAttributeName:@"track-color"];
+    [slider setValue:trackColor forThemedAttributeName:@"track-color" inControlState:CPControlStateVertical];
 
         var knobColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob.png" size:CGSizeMake(23.0, 24.0)]];
         knobHighlightedColor = [CPColor colorWithPatternImage:[_CPCibCustomResource imageResourceWithName:"knob-highlighted.png" size:CGSizeMake(23.0, 24.0)]];