diff --git a/AppKit/CPWindow/_CPStandardWindowView.j b/AppKit/CPWindow/_CPStandardWindowView.j index af35dd92b..d5a2a0085 100644 --- a/AppKit/CPWindow/_CPStandardWindowView.j +++ b/AppKit/CPWindow/_CPStandardWindowView.j @@ -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)]; diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index c9d8ba557..264752295 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -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] diff --git a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd index 1853bc824..9f72b63b6 100755 Binary files a/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd and b/AppKit/Themes/Aristo2/Artwork/Aristo 11-06-07.psd differ diff --git a/AppKit/Themes/Aristo2/Artwork/window-standard-button-unsaved.psd b/AppKit/Themes/Aristo2/Artwork/window-standard-button-unsaved.psd new file mode 100644 index 000000000..348815d8e Binary files /dev/null and b/AppKit/Themes/Aristo2/Artwork/window-standard-button-unsaved.psd differ diff --git a/AppKit/Themes/Aristo2/Artwork/window-standard-close-button.psd b/AppKit/Themes/Aristo2/Artwork/window-standard-close-button.psd new file mode 100644 index 000000000..897891310 Binary files /dev/null and b/AppKit/Themes/Aristo2/Artwork/window-standard-close-button.psd differ diff --git a/AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png b/AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png deleted file mode 100644 index 11f4dfcc9..000000000 Binary files a/AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png and /dev/null differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-button-unsaved-inactive.png b/AppKit/Themes/Aristo2/Resources/window-standard-button-unsaved-inactive.png new file mode 100644 index 000000000..3ed0fbb28 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-standard-button-unsaved-inactive.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-close-button-inactive.png b/AppKit/Themes/Aristo2/Resources/window-standard-close-button-inactive.png new file mode 100644 index 000000000..3e9c48782 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-standard-close-button-inactive.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-head-center.png b/AppKit/Themes/Aristo2/Resources/window-standard-head-center.png index f6c05ccde..28675a7ab 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-head-center.png and b/AppKit/Themes/Aristo2/Resources/window-standard-head-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-center.png b/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-center.png new file mode 100644 index 000000000..3a13396a5 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-left.png b/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-left.png new file mode 100644 index 000000000..cb186c02c Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-right.png b/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-right.png new file mode 100644 index 000000000..9b554d39a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-standard-head-inactive-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-head-left.png b/AppKit/Themes/Aristo2/Resources/window-standard-head-left.png index 1ddc91e61..cde53ff2b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-head-left.png and b/AppKit/Themes/Aristo2/Resources/window-standard-head-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-head-right.png b/AppKit/Themes/Aristo2/Resources/window-standard-head-right.png index 7aa57b40f..1fb1c6918 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-head-right.png and b/AppKit/Themes/Aristo2/Resources/window-standard-head-right.png differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index ca292bdd4..3d6461e49 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -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