colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-03 21:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

add X and Y offet theme properties for supression button

Browse Source
This commit is contained in:
Antoine Mercadal committed 2010-11-09 18:27:26 +01:00
1 parent 23c2f4bb8c
commit ee4ef882dd
2 files changed
+11 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPAlert.j
+7 -4
View File
@@ -363,10 +363,11 @@ var CPAlertLabelOffset = 3.0;
if (_showSupressionButton)
{
var inset = [self currentValueForThemeAttribute:@"content-inset"],
suppressionViewOffset = [self currentValueForThemeAttribute:@"supression-button-offset"],
suppressionButtonViewOriginY = CPRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + CPAlertLabelOffset + suppressionViewOffset;
suppressionViewXOffset = [self currentValueForThemeAttribute:@"supression-button-x-offset"],
suppressionViewYOffset = [self currentValueForThemeAttribute:@"supression-button-y-offset"],
suppressionButtonViewOriginY = CPRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + CPAlertLabelOffset + suppressionViewYOffset;
[_supressionButton setFrameOrigin:CGPointMake(inset.left, suppressionButtonViewOriginY)];
[_supressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
[[_alertPanel contentView] addSubview:_supressionButton];
}
}
@@ -599,6 +600,7 @@ var CPAlertLabelOffset = 3.0;
[CPNull null],
[CPNull null],
[CPNull null],
0.0,
0.0
]
forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
@@ -611,7 +613,8 @@ var CPAlertLabelOffset = 3.0;
@"help-image",
@"help-image-left-offset",
@"help-image-pressed",
@"supression-button-offset"
@"supression-button-y-offset",
@"supression-button-x-offset"
]];
}
AppKit/Themes/Aristo/ThemeDescriptors.j
+4 -2
View File
@@ -1427,7 +1427,8 @@ var themedButtonValues = nil,
inset = CGInsetMake(15, 15, 15, 80),
imageOffset = CGPointMake(15, 18),
buttonOffset = 10.0,
supressionButtonOffset = 10.0,
supressionButtonYOffset = 10.0,
supressionButtonXOffset = 2.0,
helpLeftOffset = 15,
messageFont = [CPFont boldSystemFontOfSize:13.0],
informativeFont = [CPFont systemFontOfSize:12.0],
@@ -1456,7 +1457,8 @@ var themedButtonValues = nil,
[@"help-image-pressed", helpIconPressed],
[@"help-image-left-offset", helpLeftOffset],
[@"button-offset", buttonOffset],
[@"supression-button-offset", supressionButtonOffset]
[@"supression-button-x-offset", supressionButtonXOffset],
[@"supression-button-y-offset", supressionButtonYOffset]
];
[self registerThemeValues:themedAlertValues forView:alert];