From c2cb84c86ec9a3db773adca91ea5630a63e27320 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Wed, 1 Oct 2014 19:21:01 +0000 Subject: OS X: Force the size of the memory card images to 32 px. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91776 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/Resources/Base.lproj/Configuration.xib | 186 +++++++++++++------------- macosx/Source/PcsxrMemoryObject.m | 5 +- 2 files changed, 94 insertions(+), 97 deletions(-) diff --git a/macosx/Resources/Base.lproj/Configuration.xib b/macosx/Resources/Base.lproj/Configuration.xib index 0c2688b3..e702a2ae 100644 --- a/macosx/Resources/Base.lproj/Configuration.xib +++ b/macosx/Resources/Base.lproj/Configuration.xib @@ -1,5 +1,5 @@ - + @@ -38,7 +38,7 @@ - + @@ -58,15 +58,15 @@ - + - + - + - + @@ -134,7 +134,7 @@ - + @@ -168,87 +168,85 @@ - - + + - + - - + + - + - + - + - + - + - - - - - + + + - - + + - + - - + + - + - + - + - + - + - + - + - + - - - - + + + + @@ -256,18 +254,14 @@ - - - - - - + + + - - - - + + + @@ -277,13 +271,13 @@ - + - + - + @@ -337,13 +331,13 @@ - + - + - + @@ -398,13 +392,13 @@ - + - + - + @@ -459,13 +453,13 @@ - + - + - + @@ -519,13 +513,13 @@ - + - + - + @@ -579,13 +573,13 @@ - + - + - + @@ -773,7 +767,7 @@ - - - - - - + @@ -925,7 +919,7 @@ - - + @@ -943,7 +937,7 @@ - - + @@ -961,7 +955,7 @@ - - + @@ -979,7 +973,7 @@ - - + @@ -997,7 +991,7 @@ - - + @@ -1015,7 +1009,7 @@ - + @@ -1024,7 +1018,7 @@ - + @@ -1032,7 +1026,7 @@ - + Any key pressed at the same time as the GPU Key Modifier will be sent directly to the GPU Plugin. This is useful for plugins with menus. Control (ctrl) is the recommended modifier; command (cmd or apple key) should not be used unless you absolutely want to. @@ -1161,7 +1155,7 @@ - + @@ -1181,7 +1175,7 @@ - + diff --git a/macosx/Source/PcsxrMemoryObject.m b/macosx/Source/PcsxrMemoryObject.m index 87d6f2fd..8ab320de 100644 --- a/macosx/Source/PcsxrMemoryObject.m +++ b/macosx/Source/PcsxrMemoryObject.m @@ -196,7 +196,9 @@ static NSString *MemLabelEndLink; - (NSImage*)memImage { if (self.hasImages == NO) { - return [PcsxrMemoryObject blankImage]; + NSImage *tmpBlank = [PcsxrMemoryObject blankImage]; + tmpBlank.size = NSMakeSize(32, 32); + return tmpBlank; } if (!_memImage) { @@ -212,6 +214,7 @@ static NSString *MemLabelEndLink; CFRelease(dst); _memImage = [[NSImage alloc] initWithData:gifData]; + _memImage.size = NSMakeSize(32, 32); } return _memImage; } -- cgit v1.2.3