colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-01 00:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.mv.usa.alcatel.com:amercada/Cappuccino

Browse Source
This commit is contained in:
Antoine Mercadal
2013-02-01 15:20:48 -08:00
parent 351ee1a54e aa40a039f9
commit 9a4e7fc467
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPAlert.j
-4
View File
@@ -469,10 +469,6 @@ var bottomHeight = 71;
panelSize.height = minimumSize.height;
buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
if ([_window styleMask] & _CPModalWindowMask)
buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height / 2 + buttonOffset;
offsetX = panelSize.width - inset.right;
switch ([_window styleMask])
AppKit/Themes/Aristo/ThemeDescriptors.j
+2 -2
View File
@@ -1877,7 +1877,6 @@ var themedButtonValues = nil,
{
var alert = [CPAlert new],
buttonOffset = 10.0,
buttonMarginY = 10.0,
defaultElementsMargin = 3.0,
errorIcon = PatternImage("alert-error.png", 53.0, 46.0),
helpIcon = PatternImage("alert-help.png", 24.0, 24.0),
@@ -1896,7 +1895,6 @@ var themedButtonValues = nil,
themedAlertValues =
[
[@"modal-window-button-margin-y", buttonMarginY],
[@"button-offset", buttonOffset],
[@"content-inset", inset],
[@"default-elements-margin", defaultElementsMargin],
@@ -1912,6 +1910,8 @@ var themedButtonValues = nil,
[@"message-text-alignment", CPJustifiedTextAlignment],
[@"message-text-color", [CPColor blackColor]],
[@"message-text-font", messageFont],
[@"modal-window-button-margin-x", -1.0],
[@"modal-window-button-margin-y", 23.0],
[@"suppression-button-text-color", [CPColor blackColor]],
[@"suppression-button-text-font", suppressionButtonFont],
[@"size", size],
AppKit/Themes/Aristo2/ThemeDescriptors.j
+2 -1
View File
@@ -1376,7 +1376,8 @@ var themedButtonValues = nil,
[@"message-text-alignment", CPJustifiedTextAlignment],
[@"message-text-color", [CPColor blackColor]],
[@"message-text-font", messageFont],
[@"modal-window-button-margin-x", -15],
[@"modal-window-button-margin-x", -18.0],
[@"modal-window-button-margin-y", 15.0],
[@"suppression-button-text-color", [CPColor blackColor]],
[@"suppression-button-text-font", suppressionButtonFont],
[@"size", size],