colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-06 18:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/inactive-window'

Browse Source 
Conflicts:
	AppKit/Themes/Aristo/ThemeDescriptors.j
	AppKit/Themes/Aristo2/ThemeDescriptors.j
This commit is contained in:
Aparajita Fishman
2013-01-19 15:15:51 +07:00
parent 6170a274d7 3b7262681c
commit 24c0f2aedc
15 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPWindow/_CPStandardWindowView.j
+14 -14
View File
@@ -28,9 +28,10 @@
@implementation _CPTexturedWindowHeadView : CPView
{
CPView _gradientView;
CPView _solidView;
CPView _dividerView;
_CPWindowView _parentView;
CPView _gradientView;
CPView _solidView;
CPView _dividerView;
}
+ (CPString)defaultThemeClass
@@ -44,18 +45,17 @@
forKeys:[]];
}
- (id)initWithFrame:(CGRect)aFrame
- (id)initWithFrame:(CGRect)aFrame windowView:(_CPWindowView)parentView
{
self = [super initWithFrame:aFrame];
if (self)
{
_parentView = parentView;
_gradientView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
[self addSubview:_gradientView];
_solidView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
[self addSubview:_solidView];
}
@@ -70,9 +70,9 @@
bounds = [self bounds];
[_gradientView setFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), gradientHeight)];
[_gradientView setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"bezel-head-color" forClass:_CPStandardWindowView]];
[_gradientView setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"bezel-head-color" inState:[_parentView themeState] forClass:_CPStandardWindowView]];
[_solidView setFrame:CGRectMake(0.0, gradientHeight ,CGRectGetWidth(bounds), CGRectGetHeight(bounds) - gradientHeight)];
[_solidView setFrame:CGRectMake(0.0, gradientHeight, CGRectGetWidth(bounds), CGRectGetHeight(bounds) - gradientHeight)];
[_solidView setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"solid-color" forClass:_CPStandardWindowView]];
}
@@ -131,7 +131,7 @@
var theClass = [self class],
bounds = [self bounds];
_headView = [[_CPTexturedWindowHeadView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), [self valueForThemeAttribute:@"title-bar-height"])];
_headView = [[_CPTexturedWindowHeadView alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), [self valueForThemeAttribute:@"title-bar-height"]) windowView:self];
[_headView setAutoresizingMask:CPViewWidthSizable];;
[_headView setHitTests:NO];
@@ -267,13 +267,13 @@
if (_isDocumentEdited)
{
[_closeButton setImage:[self valueForThemeAttribute:@"unsaved-image-button"]];
[_closeButton setImage:[self currentValueForThemeAttribute:@"unsaved-image-button"]];
[_closeButton setAlternateImage:[self valueForThemeAttribute:@"unsaved-image-highlighted-button"]];
}
else
{
[_closeButton setImage:[self valueForThemeAttribute:@"close-image-button"]];
[_closeButton setAlternateImage:[self valueForThemeAttribute:@"close-image-highlighted-button"]];
[_closeButton setImage:[self currentValueForThemeAttribute:@"close-image-button"]];
[_closeButton setAlternateImage:[self currentValueForThemeAttribute:@"close-image-highlighted-button"]];
}
}
@@ -336,12 +336,12 @@
[_minimizeButton setImage:[self valueForThemeAttribute:@"minimize-image-button"]];
[_minimizeButton setAlternateImage:[self valueForThemeAttribute:@"minimize-image-highlighted-button"]];
if(![_headView isHidden])
if (![_headView isHidden])
[_headView setFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), [self toolbarMaxY])];
else
[_headView setFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(bounds), 0)];
if(![_dividerView isHidden])
if (![_dividerView isHidden])
[_dividerView setFrame:CGRectMake(0.0, CGRectGetMaxY([_headView frame]), CGRectGetWidth(bounds), 1.0)];
else
[_dividerView setFrame:CGRectMake(0.0, CGRectGetMaxY([_headView frame]), CGRectGetWidth(bounds), 0.0)];
AppKit/Themes/Aristo/ThemeDescriptors.j
+23 -23
View File
@@ -18,10 +18,10 @@ var themedButtonValues = nil,
themedHorizontalSliderValues = nil,
themedVerticalSliderValues = nil,
themedCircularSliderValues = nil,
themedButtonBarValues = nil,
themedAlertValues = nil,
themedProgressIndicator = nil,
themedIndeterminateProgressIndicator = nil;
themedIndeterminateProgressIndicator = nil,
themedWindowViewValues = nil;
/*
HOW TO ADD OR MODIFY THEMED ELEMENTS
@@ -694,7 +694,6 @@ var themedButtonValues = nil,
],
PatternIsVertical);
themedVerticalScrollerValues =
[
// Common
@@ -1171,16 +1170,17 @@ var themedButtonValues = nil,
],
PatternIsHorizontal),
themedColorWellValues = [
[@"bezel-color", bezelColor, CPThemeStateBordered],
[@"content-inset", CGInsetMake(5.0, 5.0, 5.0, 5.0), CPThemeStateBordered],
[@"content-border-inset", CGInsetMake(5.0, 5.0, 4.0, 5.0), CPThemeStateBordered],
[@"content-border-color", contentBorderColor, CPThemeStateBordered],
themedColorWellValues =
[
[@"bezel-color", bezelColor, CPThemeStateBordered],
[@"content-inset", CGInsetMake(5.0, 5.0, 5.0, 5.0), CPThemeStateBordered],
[@"content-border-inset", CGInsetMake(5.0, 5.0, 4.0, 5.0), CPThemeStateBordered],
[@"content-border-color", contentBorderColor, CPThemeStateBordered],
[@"bezel-color", bezelHighlightedColor, CPThemeStateBordered | CPThemeStateHighlighted],
[@"bezel-color", bezelHighlightedColor, CPThemeStateBordered | CPThemeStateHighlighted],
[@"bezel-color", bezelDisabledColor, CPThemeStateBordered | CPThemeStateDisabled],
];
[@"bezel-color", bezelDisabledColor, CPThemeStateBordered | CPThemeStateDisabled],
];
[self registerThemeValues:themedColorWellValues forView:colorWell];
@@ -2117,18 +2117,17 @@ var themedButtonValues = nil,
[@"level-indicator-segment-critical-left.png", 3.0, 17.0],
[@"level-indicator-segment-critical-center.png", 1.0, 17.0],
[@"level-indicator-segment-critical-right.png", 3.0, 17.0]
]);
]),
themeValues =
[
[@"bezel-color", bezelColor],
[@"color-empty", emptyColor],
[@"color-normal", normalColor],
[@"color-warning", warningColor],
[@"color-critical", criticalColor],
[@"spacing", 1.0]
];
themeValues =
[
[@"bezel-color", bezelColor],
[@"color-empty", emptyColor],
[@"color-normal", normalColor],
[@"color-warning", warningColor],
[@"color-critical", criticalColor],
[@"spacing", 1.0]
];
[self registerThemeValues:themeValues forView:levelIndicator];
@@ -2187,7 +2186,8 @@ var themedButtonValues = nil,
imageLeaf = PatternImage(@"browser-image-leaf.png", 9.0, 9.0),
imageLeafPressed = PatternImage(@"browser-image-leaf-pressed.png", 9.0, 9.0),
themedBrowser = [
themedBrowser =
[
["image-control-resize", imageResize],
["image-control-leaf", imageLeaf],
["image-control-leaf-pressed", imageLeafPressed]
AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd
BIN
View File
Binary file not shown.
AppKit/Themes/Aristo2/Artwork/window-standard-button-unsaved.psd
BIN
View File
Binary file not shown.
AppKit/Themes/Aristo2/Artwork/window-standard-close-button.psd
BIN
View File
Binary file not shown.
AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 83 B

AppKit/Themes/Aristo2/Resources/window-standard-button-unsaved-inactive.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

AppKit/Themes/Aristo2/Resources/window-standard-close-button-inactive.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

AppKit/Themes/Aristo2/Resources/window-standard-head-center.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 93 B

After

Width:  |  Height:  |  Size: 1017 B

AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-center.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1016 B

AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-left.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-right.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

AppKit/Themes/Aristo2/Resources/window-standard-head-left.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 146 B

After

Width:  |  Height:  |  Size: 1.1 KiB

AppKit/Themes/Aristo2/Resources/window-standard-head-right.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 159 B

After

Width:  |  Height:  |  Size: 1.1 KiB

AppKit/Themes/Aristo2/ThemeDescriptors.j
+47 -34
View File
@@ -16,7 +16,6 @@ var themedButtonValues = nil,
themedHorizontalSliderValues = nil,
themedVerticalSliderValues = nil,
themedCircularSliderValues = nil,
themedButtonBarValues = nil,
themedAlertValues = nil,
themedWindowViewValues = nil,
themedProgressIndicator = nil,
@@ -418,7 +417,6 @@ var themedButtonValues = nil,
],
PatternIsVertical);
themedVerticalScrollerValues =
[
// Common
@@ -438,8 +436,8 @@ var themedButtonValues = nil,
[@"knob-color", knobColorDark, CPThemeStateVertical | CPThemeStateScrollerKnobDark],
[@"increment-line-color", [CPNull null], CPThemeStateVertical],
[@"decrement-line-color", [CPNull null], CPThemeStateVertical],
[@"decrement-line-size", CPSizeMakeZero(), CPThemeStateVertical],
[@"increment-line-size", CPSizeMakeZero(), CPThemeStateVertical],
[@"decrement-line-size", CGSizeMakeZero(), CPThemeStateVertical],
[@"increment-line-size", CGSizeMakeZero(), CPThemeStateVertical],
// Legacy
[@"scroller-width", 14.0, CPThemeStateVertical | CPThemeStateScrollViewLegacy],
@@ -457,8 +455,8 @@ var themedButtonValues = nil,
[@"knob-color", knobColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy | CPThemeStateScrollerKnobDark],
[@"increment-line-color", incrementColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy],
[@"decrement-line-color", decrementColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy],
[@"decrement-line-size", CPSizeMake(14.0, 11.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy],
[@"increment-line-size", CPSizeMake(14.0, 11.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy]
[@"decrement-line-size", CGSizeMake(14.0, 11.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy],
[@"increment-line-size", CGSizeMake(14.0, 11.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy]
];
[self registerThemeValues:themedVerticalScrollerValues forView:scroller];
@@ -547,8 +545,8 @@ var themedButtonValues = nil,
[@"knob-color", knobColor],
[@"knob-color", knobColorLight, CPThemeStateScrollerKnobLight],
[@"knob-color", knobColorDark, CPThemeStateScrollerKnobDark],
[@"decrement-line-size", CPSizeMakeZero()],
[@"increment-line-size", CPSizeMakeZero()],
[@"decrement-line-size", CGSizeMakeZero()],
[@"increment-line-size", CGSizeMakeZero()],
// Legacy
[@"scroller-width", 14.0, CPThemeStateScrollViewLegacy],
@@ -564,8 +562,8 @@ var themedButtonValues = nil,
[@"knob-color", knobColorLegacy, CPThemeStateScrollViewLegacy | CPThemeStateScrollerKnobDark],
[@"increment-line-color", incrementColorLegacy, CPThemeStateScrollViewLegacy],
[@"decrement-line-color", decrementColorLegacy, CPThemeStateScrollViewLegacy],
[@"decrement-line-size", CPSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy],
[@"increment-line-size", CPSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy]
[@"decrement-line-size", CGSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy],
[@"increment-line-size", CGSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy]
];
[self registerThemeValues:themedHorizontalScrollerValues forView:scroller];
@@ -573,7 +571,7 @@ var themedButtonValues = nil,
return scroller;
}
// + (CPTextField)themedStandardTextField
+ (CPTextField)themedStandardTextField
{
var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 160.0, 29.0)],
@@ -735,7 +733,8 @@ var themedButtonValues = nil,
imageCancel = PatternImage("search-field-cancel.png", 22.0, 22.0),
imageCancelPressed = PatternImage("search-field-cancel-pressed.png", 22.0, 22.0),
overrides = [
overrides =
[
[@"image-search", imageSearch],
[@"image-find", imageFind],
[@"image-cancel", imageCancel],
@@ -1634,7 +1633,7 @@ var themedButtonValues = nil,
+ (_CPToolTipWindowView)themedTooltip
{
var toolTipView = [[_CPToolTipWindowView alloc] initWithFrame:CPRectMake(0.0, 0.0, 200.0, 100.0) styleMask:_CPToolTipWindowMask],
var toolTipView = [[_CPToolTipWindowView alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 100.0) styleMask:_CPToolTipWindowMask],
themeValues =
[
@@ -1801,10 +1800,10 @@ var themedButtonValues = nil,
[@"border-width", 1.0],
[@"border-color", [CPColor colorWithHexString:@"B7B7B7"]],
[@"corner-radius", 3.0],
[@"inner-shadow-offset", CPSizeMakeZero()],
[@"inner-shadow-offset", CGSizeMakeZero()],
[@"inner-shadow-color", [CPColor blackColor]],
[@"inner-shadow-size", 6.0],
[@"content-margin", CPSizeMakeZero()]
[@"content-margin", CGSizeMakeZero()]
];
[self registerThemeValues:themeValues forView:box];
@@ -1851,7 +1850,6 @@ var themedButtonValues = nil,
[@"level-indicator-segment-critical-right.png", 3.0, 17.0]
]),
themeValues =
[
[@"bezel-color", bezelColor],
@@ -1919,7 +1917,8 @@ var themedButtonValues = nil,
imageLeaf = PatternImage(@"browser-image-leaf.png", 9.0, 9.0),
imageLeafPressed = PatternImage(@"browser-image-leaf-pressed.png", 9.0, 9.0),
themedBrowser = [
themedBrowser =
[
["image-control-resize", imageResize],
["image-control-leaf", imageLeaf],
["image-control-leaf-pressed", imageLeafPressed]
@@ -2015,8 +2014,8 @@ var themedButtonValues = nil,
themeValues =
[
[@"close-image-size", CPSizeMake(18.0, 18.0)],
[@"close-image-origin", CPPointMake(6.0,4.0)],
[@"close-image-size", CGSizeMake(18.0, 18.0)],
[@"close-image-origin", CGPointMake(6.0,4.0)],
[@"close-image", closeImage],
[@"close-active-image", closeActiveImage],
[@"bezel-color", HUDBezelColor],
@@ -2049,6 +2048,13 @@ var themedButtonValues = nil,
[@"window-standard-head-right.png", 5.0, 31.0]
], PatternIsHorizontal),
bezelHeadInactiveColor = PatternColor(
[
[@"window-standard-head-inactive-left.png", 5.0, 31.0],
[@"window-standard-head-inactive-center.png", 1.0, 31.0],
[@"window-standard-head-inactive-right.png", 5.0, 31.0]
], PatternIsHorizontal),
solidColor = PatternColor(
[
[@"window-standard-head-solid-top-left.png", 5.0, 1.0],
@@ -2076,11 +2082,13 @@ var themedButtonValues = nil,
]),
closeButtonImage = PatternImage(@"window-standard-close-button.png", 16, 16),
closeButtonImageHighlighted = PatternImage(@"window-standard-button-highlighted.png",16, 16),
unsavedButtonImage = PatternImage(@"window-standard-button-unsaved.png",16, 16),
unsavedButtonImageHighlighted = PatternImage(@"window-standard-close-button-unsaved-highlighted.png",16, 16),
minimizeButtonImage = PatternImage(@"window-standard-minimize-button.png",16, 16),
minimizeButtonImageHighlighted = PatternImage(@"window-standard-minimize-button-highlighted.png",16, 16),
closeButtonImageInactive = PatternImage(@"window-standard-close-button-inactive.png", 16, 16),
closeButtonImageHighlighted = PatternImage(@"window-standard-button-highlighted.png", 16, 16),
unsavedButtonImage = PatternImage(@"window-standard-button-unsaved.png", 16, 16),
unsavedButtonImageInactive = PatternImage(@"window-standard-button-unsaved-inactive.png", 16, 16),
unsavedButtonImageHighlighted = PatternImage(@"window-standard-close-button-unsaved-highlighted.png", 16, 16),
minimizeButtonImage = PatternImage(@"window-standard-minimize-button.png", 16, 16),
minimizeButtonImageHighlighted = PatternImage(@"window-standard-minimize-button-highlighted.png", 16, 16),
sheetShadow = PatternColor(@"window-attached-sheet-shadow.png", 9, 8),
resizeIndicator = PatternImage(@"window-resize-indicator.png", 12, 12),
@@ -2088,11 +2096,13 @@ var themedButtonValues = nil,
themeValues =
[
[@"gradient-height", 31.0],
[@"bezel-head-color", bezelHeadColor],
[@"bezel-head-color", bezelHeadInactiveColor, CPThemeStateNormal],
[@"bezel-head-color", bezelHeadColor, CPThemeStateKeyWindow],
[@"bezel-head-color", bezelHeadColor, CPThemeStateMainWindow],
[@"solid-color", solidColor],
[@"title-font", [CPFont boldSystemFontOfSize:CPFontCurrentSystemSize]],
[@"title-text-color", [CPColor colorWithWhite:22.0 / 255.0 alpha:0.75]],
[@"title-text-color", [CPColor colorWithHexString:@"848484"]],
[@"title-text-color", [CPColor colorWithWhite:22.0 / 255.0 alpha:1], CPThemeStateKeyWindow],
[@"title-text-shadow-color", [CPColor whiteColor]],
[@"title-text-shadow-offset", CGSizeMake(0.0, 1.0)],
@@ -2106,15 +2116,17 @@ var themedButtonValues = nil,
[@"body-color", bezelColor],
[@"title-bar-height", 31],
[@"unsaved-image-button" ,unsavedButtonImage],
[@"unsaved-image-highlighted-button" ,unsavedButtonImageHighlighted],
[@"close-image-button" ,closeButtonImage],
[@"close-image-highlighted-button" ,closeButtonImageHighlighted],
[@"minimize-image-button" ,minimizeButtonImage],
[@"minimize-image-highlighted-button" ,minimizeButtonImageHighlighted],
[@"unsaved-image-button", unsavedButtonImage],
[@"unsaved-image-highlighted-button", unsavedButtonImageHighlighted],
[@"close-image-button", closeButtonImageInactive, CPThemeStateNormal],
[@"close-image-button", closeButtonImage, CPThemeStateKeyWindow],
[@"close-image-button", closeButtonImage, CPThemeStateMainWindow],
[@"close-image-highlighted-button", closeButtonImageHighlighted],
[@"minimize-image-button", minimizeButtonImage],
[@"minimize-image-highlighted-button", minimizeButtonImageHighlighted],
[@"close-image-size", CPSizeMake(16.0, 16.0)],
[@"close-image-origin", CPPointMake(8.0, 10.0)],
[@"close-image-size", CGSizeMake(16.0, 16.0)],
[@"close-image-origin", CGPointMake(8.0, 10.0)],
[@"resize-indicator", resizeIndicator],
[@"attached-sheet-shadow-color", sheetShadow],
@@ -2581,4 +2593,5 @@ var themedButtonValues = nil,
[self registerThemeValues:[self defaultThemeOverridesAddedTo:hudSpecific] forView:button inherit:themedRadioButtonValues];
return button;
}
@end