adium 4361:f4b06cb13b51: Highlight the menu button. "Hey Skype, ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/f4b06cb13b51
revision:	4361:f4b06cb13b51
branch:		EmoticonsMenu
author:		Adrian Godoroja <robotive at me.com>
date:		Sat Dec 10 21:36:51 2011 +0200

Highlight the menu button. "Hey Skype, this is how it should look ;-)"

diffs (68 lines):

diff -r acbd654cf912 -r f4b06cb13b51 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Sat Dec 10 00:45:11 2011 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Sat Dec 10 21:36:51 2011 +0200
@@ -1441,11 +1441,11 @@
 		9718DF45136A2C5200013760 /* AIImageCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 9718DF43136A2C5200013760 /* AIImageCollectionView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9718DF46136A2C5200013760 /* AIImageCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9718DF44136A2C5200013760 /* AIImageCollectionView.m */; };
 		9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9722ABC713257D7F00CAB486 /* ContactListWindow.xib */; };
+		972AB3A11493CF2300381105 /* emoticons_menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 974C7524148570E2000686BA /* emoticons_menu.png */; };
+		972AB3A21493D1BA00381105 /* MessageViewEmoticonsMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 974C752C148578F6000686BA /* MessageViewEmoticonsMenu.xib */; };
 		97483A011486DD87002D1FA8 /* AIMessageEntryTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B5827E90613CE9D0004BD25 /* AIMessageEntryTextView.m */; };
 		97483A051486E92C002D1FA8 /* AIMessageViewEmoticonsController.h in Headers */ = {isa = PBXBuildFile; fileRef = 974C753314857BF4000686BA /* AIMessageViewEmoticonsController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		97483A061486E93E002D1FA8 /* AIMessageViewEmoticonsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 974C753414857BF4000686BA /* AIMessageViewEmoticonsController.m */; };
-		974ECFA614896D900026659E /* emoticons_menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 974C7524148570E2000686BA /* emoticons_menu.png */; };
-		974ECFA714896D9E0026659E /* MessageViewEmoticonsMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 974C752C148578F6000686BA /* MessageViewEmoticonsMenu.xib */; };
 		9760D24613E49A560031FA1A /* AboutDialog_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 9760D24513E49A560031FA1A /* AboutDialog_bg.png */; };
 		97AF5CDB13191DE200550C41 /* AIContactListUserPictureMenuController.m in Sources */ = {isa = PBXBuildFile; fileRef = 97AF5CDA13191DE200550C41 /* AIContactListUserPictureMenuController.m */; };
 		97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 97AF5CF313191E9A00550C41 /* ContactListChangeUserPictureMenu.xib */; };
@@ -9754,6 +9754,8 @@
 				97E4B50113E7490000A8BA53 /* Flap_192.png in Resources */,
 				97E4B50213E7490000A8BA53 /* Awake_192.png in Resources */,
 				7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */,
+				972AB3A11493CF2300381105 /* emoticons_menu.png in Resources */,
+				972AB3A21493D1BA00381105 /* MessageViewEmoticonsMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9790,8 +9792,6 @@
 				1199AB0610BE13E600646322 /* Authorize.tiff in Resources */,
 				1199AB0710BE13E600646322 /* Deny.tiff in Resources */,
 				1199AB0810BE13E600646322 /* Ignore.tiff in Resources */,
-				974ECFA614896D900026659E /* emoticons_menu.png in Resources */,
-				974ECFA714896D9E0026659E /* MessageViewEmoticonsMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff -r acbd654cf912 -r f4b06cb13b51 Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m	Sat Dec 10 00:45:11 2011 +0200
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m	Sat Dec 10 21:36:51 2011 +0200
@@ -1782,14 +1782,21 @@
 		
 		[emoticonsMenuButton setFrameSize:[emoticonsMenuIcon size]];
 		[emoticonsMenuButton setAutoresizingMask:NSViewMinXMargin];
-        [emoticonsMenuButton setButtonType:NSMomentaryPushInButton];
+        [emoticonsMenuButton setButtonType:NSMomentaryChangeButton];
         [emoticonsMenuButton setBordered:NO];
-        [emoticonsMenuButton setImage:emoticonsMenuIcon], [emoticonsMenuIcon release];
-        [[emoticonsMenuButton cell] setImageScaling:NSImageScaleNone];
-		[[emoticonsMenuButton cell] setHighlightsBy:NSNoCellMask];
-        [[emoticonsMenuButton cell] setShowsStateBy:NSNoCellMask];
+		[emoticonsMenuButton setAction:@selector(popUpEmoticonsMenu)];
+		[[emoticonsMenuButton cell] setImageScaling:NSImageScaleNone];
+
+		[emoticonsMenuButton setImage:[emoticonsMenuIcon copy]];
 		
-        [emoticonsMenuButton setAction:@selector(popUpEmoticonsMenu)];
+		// Adjust image for On/Alternate state
+		[emoticonsMenuIcon lockFocus];		
+		[emoticonsMenuIcon drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositePlusDarker fraction:1.0f];
+		[emoticonsMenuIcon unlockFocus];
+		
+		[emoticonsMenuButton setAlternateImage:emoticonsMenuIcon];
+		
+		[emoticonsMenuIcon release];
 
 		// Register for notifications
 		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(positionIndicators:)
diff -r acbd654cf912 -r f4b06cb13b51 Resources/emoticons_menu.png
Binary file Resources/emoticons_menu.png has changed