From ee4ef882ddf5a7c259130674e8743257a61167fa Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@inframonde.eu>
Date: Tue, 9 Nov 2010 18:27:26 +0100
Subject: [PATCH] add X and Y offet theme properties for supression button

---
 AppKit/CPAlert.j                        | 11 +++++++----
 AppKit/Themes/Aristo/ThemeDescriptors.j |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
index e0240fc49..cbeafc866 100644
--- a/AppKit/CPAlert.j
+++ b/AppKit/CPAlert.j
@@ -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"
                                                 ]];
 }
 
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 8dc7c67c0..325d7e402 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -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];