From be3d963074ee8adf5da0371761e090488b3681d3 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sat, 15 Dec 2012 21:07:55 +0000
Subject: Mac Patch 13437.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81770 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/ConfigurationController.m | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'macosx/ConfigurationController.m')

diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index 42eeee89..730dfaf8 100644
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -213,7 +213,9 @@ NSString *memChangeNotifier = @"PcsxrMemoryCardDidChangeNotifier";
 	[padPlugin setPluginsTo:[list pluginsForType:PSE_LT_PAD] withType: PSE_LT_PAD];
 	[cdromPlugin setPluginsTo:[list pluginsForType:PSE_LT_CDR] withType: PSE_LT_CDR];
 	[netPlugin setPluginsTo:[list pluginsForType:PSE_LT_NET] withType: PSE_LT_NET];
-
+    
+    // Setup hotkey view
+    [hkController initialize];
 }
 
 - (void)dealloc
@@ -258,4 +260,15 @@ NSString *memChangeNotifier = @"PcsxrMemoryCardDidChangeNotifier";
 	}
 }
 
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+{
+    NSWindow *window = [self window];
+    if(tabViewItem == hkTab) {
+        [window makeFirstResponder:(NSView*)hkController];
+    }
+    else if([window firstResponder] == (NSView*)hkController) {
+        [hkController resignFirstResponder];
+    }
+}
+
 @end
-- 
cgit v1.2.3