New scroller artwork.
Reviewed by me.
Francisco Ryan Tolmasky I committed No files matched your search
@@ -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];
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
|
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 733 B After Width: | Height: | Size: 488 B |
|
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 470 B |
|
Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 340 B |
|
Before Width: | Height: | Size: 123 B After Width: | Height: | Size: 133 B |
|
Before Width: | Height: | Size: 139 B After Width: | Height: | Size: 137 B |
|
Before Width: | Height: | Size: 570 B After Width: | Height: | Size: 421 B |
|
Before Width: | Height: | Size: 774 B After Width: | Height: | Size: 502 B |
|
Before Width: | Height: | Size: 685 B After Width: | Height: | Size: 483 B |
|
Before Width: | Height: | Size: 549 B After Width: | Height: | Size: 419 B |
|
Before Width: | Height: | Size: 749 B After Width: | Height: | Size: 510 B |
|
Before Width: | Height: | Size: 674 B After Width: | Height: | Size: 486 B |
|
Before Width: | Height: | Size: 393 B After Width: | Height: | Size: 352 B |
|
Before Width: | Height: | Size: 681 B After Width: | Height: | Size: 468 B |
|
Before Width: | Height: | Size: 627 B After Width: | Height: | Size: 438 B |
|
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 135 B After Width: | Height: | Size: 140 B |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 342 B |
|
Before Width: | Height: | Size: 118 B After Width: | Height: | Size: 133 B |
@@ -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]);
|
||||
|
||||
|
||||