colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-28 14:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.7b' of git@github.com:280north/cappuccino into tlr0.7b

Browse Source
This commit is contained in:
tlrobinson
2009-05-13 18:40:20 -07:00
parent cfaf2d26a5 a71a984a03
commit af0b06ff28
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPSegmentedControl.j
+6 -3
View File
@@ -450,7 +450,7 @@ CPSegmentSwitchTrackingMomentary = 2;
}
else if (aName === "right-segment-bezel")
{
return CGRectMake(CGRectGetMaxX(bounds) - contentInset.right, bezelInset.top, contentInset.right, height);
return CGRectMake(CGRectGetMaxX(bounds) - contentInset.right - bezelInset.right, bezelInset.top, contentInset.right, height);
}
else if (aName.substring(0, "segment-bezel".length) == "segment-bezel")
{
@@ -549,9 +549,12 @@ CPSegmentSwitchTrackingMomentary = 2;
[contentView setLineBreakMode:[self valueForThemeAttribute:@"line-break-mode" inState:themeState]];
[contentView setTextShadowColor:[self valueForThemeAttribute:@"text-shadow-color" inState:themeState]];
[contentView setTextShadowOffset:[self valueForThemeAttribute:@"text-shadow-offset" inState:themeState]];
[contentView setImagePosition:[self valueForThemeAttribute:@"image-position" inState:themeState]];
[contentView setImageScaling:[self valueForThemeAttribute:@"image-scaling" inState:themeState]];
if (segment.image && segment.label)
[contentView setImagePosition:[self valueForThemeAttribute:@"image-position" inState:themeState]];
else if (segment.image)
[contentView setImagePosition:CPImageOnly];
if (i == count - 1)
continue;
AppKit/Platform/DOM/CPDOMWindowLayer.j
+3
View File
@@ -61,6 +61,9 @@
- (void)removeWindow:(CPWindow)aWindow
{
if (!aWindow._isVisible)
return;
var index = aWindow._index,
count = _windows.length - 1;