mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-10 00:48:45 +00:00
David Richardson
c062669fb5
Eliminate brittle platform-specific branching and the incomplete host-platform OS behaviour API, replacing them with a unified layout model where window frames, titles, and controls derive entirely from the active theme, with platform variants selected through a private function. * CPApplication.j: - Remove setOSBehavior:, OSBehavior, shouldMimicWindows, and simulatesWindows accessors, along with associated Info.plist keys and user defaults. - Set default theme selection through _CPThemeVariant. * CPApplication_Constants.j: Remove OS behaviour constants, dictionary, and notification. * CPCompatibility.j: Add _CPBrowserOperatingSystem to return the detected host operating system. * CPTheme.j: Remove CPThemeStateWindowsPlatform; add _CPThemeVariant to return the base theme. * CPWindow.j: Remove the _close delegation to the window view. * _CPStandardWindowView.j: - Remove OS behaviour observer, _close, and _osBehaviorDidChange:. - Position buttons and title using theme values during layout, applying fallback defaults when theme values are absent. - Read title bar and sheet values from the view's active theme rather than the default theme. * _CPTitleableWindowView.j: Query title-margin dynamically during layout instead of caching.
146 lines
4.4 KiB
Plaintext
146 lines
4.4 KiB
Plaintext
/*
|
|
* _CPTitleableWindowView.j
|
|
* AppKit
|
|
*
|
|
* Created by Alexander Ljungberg.
|
|
* Copyright 2012, SlevenBits Ltd.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
@import "CPTextField.j"
|
|
@import "_CPWindowView.j"
|
|
|
|
|
|
@implementation _CPTitleableWindowView : _CPWindowView
|
|
{
|
|
CPTextField _titleField;
|
|
int _minimumTitleFieldSize;
|
|
int _titleBarHeight;
|
|
}
|
|
|
|
+ (int)titleBarHeight
|
|
{
|
|
return [[CPTheme defaultTheme] valueForAttributeWithName:@"title-bar-height" forClass:[self class]];
|
|
}
|
|
|
|
+ (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
|
|
{
|
|
var contentRect = [super contentRectForFrameRect:aFrameRect],
|
|
titleBarHeight = [self titleBarHeight];
|
|
|
|
contentRect.origin.y += titleBarHeight;
|
|
contentRect.size.height -= titleBarHeight;
|
|
|
|
return contentRect;
|
|
}
|
|
|
|
+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
|
|
{
|
|
var frameRect = [super frameRectForContentRect:aContentRect],
|
|
titleBarHeight = [self titleBarHeight];
|
|
|
|
frameRect.origin.y -= titleBarHeight;
|
|
frameRect.size.height += titleBarHeight;
|
|
|
|
return frameRect;
|
|
}
|
|
|
|
- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
|
|
{
|
|
self = [super initWithFrame:aFrame styleMask:aStyleMask];
|
|
|
|
if (self)
|
|
{
|
|
// We cache some values for optimization
|
|
_titleBarHeight = [[self class] titleBarHeight];
|
|
|
|
var titleMargin = [self currentValueForThemeAttribute:@"title-margin"];
|
|
|
|
_titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
|
|
|
|
[_titleField setHitTests:NO];
|
|
[_titleField setStringValue:@"Untitled"];
|
|
[_titleField sizeToFit];
|
|
[_titleField setAutoresizingMask:CPViewWidthSizable];
|
|
[self setTitle:@""];
|
|
|
|
[_titleField setFrame:CGRectMake(titleMargin, 3.0, CGRectGetWidth([self bounds]) - 2 * titleMargin, CGRectGetHeight([_titleField frame]))];
|
|
|
|
[self addSubview:_titleField];
|
|
|
|
[self setNeedsLayout];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)setTitle:(CPString)aTitle
|
|
{
|
|
[_titleField setStringValue:aTitle];
|
|
|
|
_minimumTitleFieldSize = [_titleField _minimumFrameSize].width;
|
|
}
|
|
|
|
- (void)tile
|
|
{
|
|
[super tile];
|
|
|
|
var theWindow = [self window],
|
|
bounds = [self bounds],
|
|
width = CGRectGetWidth(bounds),
|
|
titleMargin = [self currentValueForThemeAttribute:@"title-margin"];
|
|
|
|
/*
|
|
The title margin is read from the theme at each tile, so the title follows a
|
|
change of theme. It was copied when the view was made, so the title kept the
|
|
old theme's margin.
|
|
|
|
The vertical alignment of the title is set by the theme, so just give it all
|
|
available space. By default the title will vertically centre within.
|
|
*/
|
|
[_titleField setFrame:CGRectMake(titleMargin, 0, width - 2 * titleMargin, _titleBarHeight)];
|
|
}
|
|
|
|
- (void)layoutSubviews
|
|
{
|
|
[super layoutSubviews];
|
|
|
|
[self setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];
|
|
|
|
[_titleField setTextColor:[self currentValueForThemeAttribute:@"title-text-color"]];
|
|
[_titleField setFont:[self currentValueForThemeAttribute:@"title-font"]];
|
|
[_titleField setAlignment:[self currentValueForThemeAttribute:@"title-alignment"]];
|
|
[_titleField setVerticalAlignment:[self currentValueForThemeAttribute:@"title-vertical-alignment"]];
|
|
[_titleField setLineBreakMode:[self currentValueForThemeAttribute:@"title-line-break-mode"]];
|
|
[_titleField setTextShadowColor:[self currentValueForThemeAttribute:@"title-text-shadow-color"]];
|
|
[_titleField setTextShadowOffset:[self currentValueForThemeAttribute:@"title-text-shadow-offset"]];
|
|
}
|
|
|
|
- (CGSize)_minimumResizeSize
|
|
{
|
|
var size = [super _minimumResizeSize];
|
|
|
|
size.height += [[self class] titleBarHeight];
|
|
return size;
|
|
}
|
|
|
|
- (int)bodyOffset
|
|
{
|
|
return [self contentRectForFrameRect:[self frame]].origin.y;
|
|
}
|
|
|
|
@end
|