diff --git a/AppKit/CPSlider.j b/AppKit/CPSlider.j index d74122c7a..63104618b 100644 --- a/AppKit/CPSlider.j +++ b/AppKit/CPSlider.j @@ -178,7 +178,7 @@ CPCircularSlider = 1; if ([self hasThemeState:CPThemeStateCircular]) { var angle = 3*PI_2 - (1.0 - [self doubleValue] - _minValue) / (_maxValue - _minValue) * PI2, - radius = CGRectGetWidth(trackRect) / 2.0 - 6.0; + radius = CGRectGetWidth(trackRect) / 2.0 - 8.0; knobRect.origin.x = radius * COS(angle) + CGRectGetMidX(trackRect) - 3.0; knobRect.origin.y = radius * SIN(angle) + CGRectGetMidY(trackRect) - 2.0; diff --git a/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png b/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png index fca36e39e..56e8d061d 100644 Binary files a/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png and b/AppKit/Themes/Aristo/Resources/CircularSliderBezel.png differ diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 4e00f026b..4e896255d 100644 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -467,8 +467,8 @@ + (CPSlider)themedCircularSlider { - var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 32.0, 32.0)], - trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"circularSliderBezel.png" size:CGSizeMake(32.0, 32.0)]); + var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)], + trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"circularSliderBezel.png" size:CGSizeMake(34.0, 34.0)]); [slider setSliderType:CPCircularSlider]; [slider setValue:trackColor forThemeAttribute:@"track-color" inState:CPThemeStateCircular];