From b963b9547b854fd45e8def70a47a5113e6eb2797 Mon Sep 17 00:00:00 2001
From: Alexandre Wilhelm <contact.dogild@gmail.com>
Date: Mon, 12 Jan 2015 18:26:53 -0800
Subject: [PATCH] Fixed: Predicate button were blurred for Aristo2

Previously, the button + and - of a CPPredicateEditor were blurred for Aristo2. Now they are nice and not blurred anymore.
This PR also add a second state for the button, the button will be darker when clicking on it.

Fixes #2183
---
 ...le-editor-button-add-highlighted-image.png | Bin 0 -> 3560 bytes
 .../rule-editor-button-add-image.png          | Bin 4012 -> 3520 bytes
 ...editor-button-remove-highlighted-image.png | Bin 0 -> 3535 bytes
 .../rule-editor-button-remove-image.png       | Bin 4011 -> 3490 bytes
 AppKit/Themes/Aristo2/ThemeDescriptors.j      |   6 ++++--
 5 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 AppKit/Themes/Aristo2/Resources/rule-editor-button-add-highlighted-image.png
 create mode 100644 AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-highlighted-image.png

diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-highlighted-image.png b/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-highlighted-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..92d3953cd237ee6d71a40601d010ede60d13c994
GIT binary patch
literal 3560
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

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-image.png b/AppKit/Themes/Aristo2/Resources/rule-editor-button-add-image.png
index c223c965bded0e74fcfcf6e1b6145b7de5f71635..c9b7592cf969f7d28fc879c969c886108300bfab 100644
GIT binary patch
delta 3519
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

literal 4012
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

diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-highlighted-image.png b/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-highlighted-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac6d5cdc98a858ea110bba5db749ef1df816ac7c
GIT binary patch
literal 3535
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
JPDHLkV1mg}r6B+S

literal 0
HcmV?d00001

diff --git a/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-image.png b/AppKit/Themes/Aristo2/Resources/rule-editor-button-remove-image.png
index f99f803e31752f1e848a81fc2f00f26ffcfe0775..0c2bce2900bb516d228c12069da9c5e422473227 100644
GIT binary patch
delta 3489
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
P00000NkvXXu0mjf2`iO@

literal 4011
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

diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 86a43e46f..5fea39d42 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -2279,6 +2279,8 @@ var themedButtonValues = nil,
         sliceLastBottomBorderColor = [CPColor colorWithWhite:0.6 alpha:1.0],
         buttonAddImage = PatternImage(@"rule-editor-button-add-image.png", 20.0, 20.0),
         buttonRemoveImage = PatternImage(@"rule-editor-button-remove-image.png", 20.0, 20.0),
+        buttonAddHighlightedImage = PatternImage(@"rule-editor-button-add-highlighted-image.png", 20.0, 20.0),
+        buttonRemoveHighlightedImage = PatternImage(@"rule-editor-button-remove-highlighted-image.png", 20.0, 20.0),
         fontColor = [CPColor colorWithWhite:150 / 255 alpha:1],
 
         ruleEditorThemedValues =
@@ -2292,9 +2294,9 @@ var themedButtonValues = nil,
             [@"font",                           [CPFont systemFontOfSize:10.0]],
             [@"font-color",                     fontColor],
             [@"add-image",                      buttonAddImage,                         CPThemeStateNormal],
-            [@"add-image",                      buttonAddImage,                         CPThemeStateHighlighted],
+            [@"add-image",                      buttonAddHighlightedImage,              CPThemeStateHighlighted],
             [@"remove-image",                   buttonRemoveImage,                      CPThemeStateNormal],
-            [@"remove-image",                   buttonRemoveImage,                      CPThemeStateHighlighted],
+            [@"remove-image",                   buttonRemoveHighlightedImage,           CPThemeStateHighlighted],
             [@"vertical-alignment",             CPCenterVerticalTextAlignment],
         ];