diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index b6664f474..69bd0208c 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -121,7 +121,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; */ + (float)scrollerWidth { - return 17.0;//[self scrollerWidthForControlSize:CPRegularControlSize]; + return 15.0;//[self scrollerWidthForControlSize:CPRegularControlSize]; } /*! @@ -130,7 +130,7 @@ NAMES_FOR_PARTS[CPScrollerKnob] = @"knob"; */ + (float)scrollerWidthForControlSize:(CPControlSize)aControlSize { - return 17.0;//_CPScrollerWidths[aControlSize]; + return 15.0;//_CPScrollerWidths[aControlSize]; } /*! diff --git a/AppKit/Themes/Aristo/Resources/scroller-down-arrow-disabled.png b/AppKit/Themes/Aristo/Resources/scroller-down-arrow-disabled.png index f6f302091..20d0883f3 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-down-arrow-disabled.png and b/AppKit/Themes/Aristo/Resources/scroller-down-arrow-disabled.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-down-arrow-highlighted.png b/AppKit/Themes/Aristo/Resources/scroller-down-arrow-highlighted.png index 00f3466ca..ce6759743 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-down-arrow-highlighted.png and b/AppKit/Themes/Aristo/Resources/scroller-down-arrow-highlighted.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-down-arrow.png b/AppKit/Themes/Aristo/Resources/scroller-down-arrow.png index e5a516aa6..d16693f25 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-down-arrow.png and b/AppKit/Themes/Aristo/Resources/scroller-down-arrow.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-center.png b/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-center.png index 514e235f7..abd26ef61 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-center.png and b/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-left.png b/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-left.png index 897505467..b4cf2610a 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-left.png and b/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-left.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-right.png b/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-right.png index 2e34e2ceb..af81149bd 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-right.png and b/AppKit/Themes/Aristo/Resources/scroller-horizontal-knob-right.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-horizontal-track-disabled.png b/AppKit/Themes/Aristo/Resources/scroller-horizontal-track-disabled.png index cd9002943..7e0745278 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-horizontal-track-disabled.png and b/AppKit/Themes/Aristo/Resources/scroller-horizontal-track-disabled.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-horizontal-track.png b/AppKit/Themes/Aristo/Resources/scroller-horizontal-track.png index 3043f2628..782f5f069 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-horizontal-track.png and b/AppKit/Themes/Aristo/Resources/scroller-horizontal-track.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-left-arrow-disabled.png b/AppKit/Themes/Aristo/Resources/scroller-left-arrow-disabled.png index 34e8f9b77..3371f342f 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-left-arrow-disabled.png and b/AppKit/Themes/Aristo/Resources/scroller-left-arrow-disabled.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-left-arrow-highlighted.png b/AppKit/Themes/Aristo/Resources/scroller-left-arrow-highlighted.png index 3c88f8e38..5079dda5a 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-left-arrow-highlighted.png and b/AppKit/Themes/Aristo/Resources/scroller-left-arrow-highlighted.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-left-arrow.png b/AppKit/Themes/Aristo/Resources/scroller-left-arrow.png index ff8c1459a..3d2fdcf62 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-left-arrow.png and b/AppKit/Themes/Aristo/Resources/scroller-left-arrow.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-right-arrow-disabled.png b/AppKit/Themes/Aristo/Resources/scroller-right-arrow-disabled.png index 2d154f203..dc63d7018 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-right-arrow-disabled.png and b/AppKit/Themes/Aristo/Resources/scroller-right-arrow-disabled.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-right-arrow-highlighted.png b/AppKit/Themes/Aristo/Resources/scroller-right-arrow-highlighted.png index b924bb18a..4606638c1 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-right-arrow-highlighted.png and b/AppKit/Themes/Aristo/Resources/scroller-right-arrow-highlighted.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-right-arrow.png b/AppKit/Themes/Aristo/Resources/scroller-right-arrow.png index 1ad602ea1..96b6ba49d 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-right-arrow.png and b/AppKit/Themes/Aristo/Resources/scroller-right-arrow.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-up-arrow-disabled.png b/AppKit/Themes/Aristo/Resources/scroller-up-arrow-disabled.png index 7da7d03e7..0142d9ca0 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-up-arrow-disabled.png and b/AppKit/Themes/Aristo/Resources/scroller-up-arrow-disabled.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-up-arrow-highlighted.png b/AppKit/Themes/Aristo/Resources/scroller-up-arrow-highlighted.png index 52c58d793..c5e96d1d7 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-up-arrow-highlighted.png and b/AppKit/Themes/Aristo/Resources/scroller-up-arrow-highlighted.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-up-arrow.png b/AppKit/Themes/Aristo/Resources/scroller-up-arrow.png index ce98d9f08..6be0e2dfa 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-up-arrow.png and b/AppKit/Themes/Aristo/Resources/scroller-up-arrow.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-bottom.png b/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-bottom.png index 93be3702c..a1140fd69 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-bottom.png and b/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-bottom.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-center.png b/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-center.png index 0e71759ec..fbdb8822e 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-center.png and b/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-center.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-top.png b/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-top.png index 297b28ac0..f7d6c3875 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-top.png and b/AppKit/Themes/Aristo/Resources/scroller-vertical-knob-top.png differ diff --git a/AppKit/Themes/Aristo/Resources/scroller-vertical-track-disabled.png b/AppKit/Themes/Aristo/Resources/scroller-vertical-track-disabled.png index a3b3544ef..7954ac948 100644 Binary files a/AppKit/Themes/Aristo/Resources/scroller-vertical-track-disabled.png and b/AppKit/Themes/Aristo/Resources/scroller-vertical-track-disabled.png differ diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index 7f747a324..a633b849a 100644 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -164,40 +164,40 @@ + (CPScroller)themedVerticalScroller { - var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 17.0, 170.0)], - trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-vertical-track.png" size:CGSizeMake(17.0, 1.0)]), - disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-vertical-track-disabled.png" size:CGSizeMake(17.0, 1.0)]); + var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)], + trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-vertical-track.png" size:CGSizeMake(15.0, 1.0)]), + disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-vertical-track-disabled.png" size:CGSizeMake(15.0, 1.0)]); - [scroller setValue:19.0 forThemeAttribute:@"minimum-knob-length" inState:CPThemeStateVertical]; + [scroller setValue:17.0 forThemeAttribute:@"minimum-knob-length" inState:CPThemeStateVertical]; [scroller setValue:CGInsetMake(0.0, 1.0, 0.0, 1.0) forThemeAttribute:@"knob-inset" inState:CPThemeStateVertical]; - [scroller setValue:CGInsetMake(-9.0, 0.0, -9.0, 0.0) forThemeAttribute:@"track-inset" inState:CPThemeStateVertical]; + [scroller setValue:CGInsetMake(-10.0, 0.0, -10.0, 0.0) forThemeAttribute:@"track-inset" inState:CPThemeStateVertical]; [scroller setValue:trackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateVertical]; [scroller setValue:disabledTrackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateVertical | CPThemeStateDisabled]; - var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow.png" size:CGSizeMake(17.0, 30.0)]), - highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow-highlighted.png" size:CGSizeMake(17.0, 30.0)]), - disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow-disabled.png" size:CGSizeMake(17.0, 30.0)]); + var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow.png" size:CGSizeMake(15.0, 25.0)]), + highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow-highlighted.png" size:CGSizeMake(15.0, 25.0)]), + disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-up-arrow-disabled.png" size:CGSizeMake(15.0, 25.0)]); - [scroller setValue:CGSizeMake(17.0, 30.0) forThemeAttribute:@"decrement-line-size" inState:CPThemeStateVertical]; + [scroller setValue:CGSizeMake(15.0, 25.0) forThemeAttribute:@"decrement-line-size" inState:CPThemeStateVertical]; [scroller setValue:arrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical]; [scroller setValue:highlightedArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical | CPThemeStateHighlighted], [scroller setValue:disabledArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateVertical | CPThemeStateDisabled]; - var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow.png" size:CGSizeMake(17.0, 30.0)]), - highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow-highlighted.png" size:CGSizeMake(17.0, 30.0)]), - disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow-disabled.png" size:CGSizeMake(17.0, 30.0)]); + var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow.png" size:CGSizeMake(15.0, 25.0)]), + highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow-highlighted.png" size:CGSizeMake(15.0, 25.0)]), + disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-down-arrow-disabled.png" size:CGSizeMake(15.0, 25.0)]); - [scroller setValue:CGSizeMake(17.0, 30.0) forThemeAttribute:@"increment-line-size" inState:CPThemeStateVertical]; + [scroller setValue:CGSizeMake(15.0, 25.0) forThemeAttribute:@"increment-line-size" inState:CPThemeStateVertical]; [scroller setValue:arrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical]; [scroller setValue:highlightedArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical | CPThemeStateHighlighted]; [scroller setValue:disabledArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateVertical | CPThemeStateDisabled]; var knobColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices: [ - [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-top.png" size:CGSizeMake(15.0, 8.0)], - [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-center.png" size:CGSizeMake(15.0, 1.0)], - [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-bottom.png" size:CGSizeMake(15.0, 10.0)] + [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-top.png" size:CGSizeMake(14.0, 8.0)], + [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-center.png" size:CGSizeMake(14.0, 1.0)], + [_CPCibCustomResource imageResourceWithName:"scroller-vertical-knob-bottom.png" size:CGSizeMake(14.0, 8.0)] ] isVertical:YES]); @@ -211,40 +211,40 @@ + (CPScroller)themedHorizontalScroller { - var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 17.0)], - trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-horizontal-track.png" size:CGSizeMake(1.0, 17.0)]), - disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-horizontal-track-disabled.png" size:CGSizeMake(17.0, 1.0)]); + var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)], + trackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-horizontal-track.png" size:CGSizeMake(1.0, 15.0)]), + disabledTrackColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-horizontal-track-disabled.png" size:CGSizeMake(1.0, 15.0)]); - [scroller setValue:19.0 forThemeAttribute:@"minimum-knob-length"]; - [scroller setValue:CGInsetMake(2.0, 0.0, 0.0, 0.0) forThemeAttribute:@"knob-inset"]; + [scroller setValue:17.0 forThemeAttribute:@"minimum-knob-length"]; + [scroller setValue:CGInsetMake(1.0, 0.0, 0.0, 0.0) forThemeAttribute:@"knob-inset"]; [scroller setValue:CGInsetMake(0.0, -10.0, 0.0, -11.0) forThemeAttribute:@"track-inset"]; [scroller setValue:trackColor forThemeAttribute:@"knob-slot-color"]; [scroller setValue:disabledTrackColor forThemeAttribute:@"knob-slot-color" inState:CPThemeStateDisabled]; - var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow.png" size:CGSizeMake(32.0, 17.0)]), - highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow-highlighted.png" size:CGSizeMake(32.0, 17.0)]), - disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow-disabled.png" size:CGSizeMake(32.0, 17.0)]); + var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow.png" size:CGSizeMake(25.0, 15.0)]), + highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow-highlighted.png" size:CGSizeMake(25.0, 15.0)]), + disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-left-arrow-disabled.png" size:CGSizeMake(25.0, 15.0)]); - [scroller setValue:CGSizeMake(32.0, 17.0) forThemeAttribute:@"decrement-line-size"]; + [scroller setValue:CGSizeMake(25.0, 15.0) forThemeAttribute:@"decrement-line-size"]; [scroller setValue:arrowColor forThemeAttribute:@"decrement-line-color"]; [scroller setValue:highlightedArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateHighlighted], [scroller setValue:disabledArrowColor forThemeAttribute:@"decrement-line-color" inState:CPThemeStateDisabled]; - var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow.png" size:CGSizeMake(31.0, 17.0)]), - highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow-highlighted.png" size:CGSizeMake(31.0, 17.0)]), - disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow-disabled.png" size:CGSizeMake(31.0, 17.0)]); + var arrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow.png" size:CGSizeMake(25.0, 15.0)]), + highlightedArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow-highlighted.png" size:CGSizeMake(25.0, 15.0)]), + disabledArrowColor = PatternColor([_CPCibCustomResource imageResourceWithName:"scroller-right-arrow-disabled.png" size:CGSizeMake(25.0, 15.0)]); - [scroller setValue:CGSizeMake(31.0, 17.0) forThemeAttribute:@"increment-line-size"]; + [scroller setValue:CGSizeMake(25.0, 15.0) forThemeAttribute:@"increment-line-size"]; [scroller setValue:arrowColor forThemeAttribute:@"increment-line-color"]; [scroller setValue:highlightedArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateHighlighted]; [scroller setValue:disabledArrowColor forThemeAttribute:@"increment-line-color" inState:CPThemeStateDisabled]; var knobColor = PatternColor([[CPThreePartImage alloc] initWithImageSlices: [ - [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-left.png" size:CGSizeMake(11.0, 15.0)], - [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-center.png" size:CGSizeMake(1.0, 15.0)], - [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-right.png" size:CGSizeMake(9.0, 15.0)] + [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-left.png" size:CGSizeMake(8.0, 14.0)], + [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-center.png" size:CGSizeMake(1.0, 14.0)], + [_CPCibCustomResource imageResourceWithName:"scroller-horizontal-knob-right.png" size:CGSizeMake(8.0, 14.0)] ] isVertical:NO]);