xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OS X: Have custom views use IB_DESIGNABLE. 

Minor comment change.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@93285 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\MaddTheSane_cp 2015-01-27 18:54:11 +00:00
parent 8796116432
commit 58cbcb2796
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
macosx/Resources/Base.lproj/CheatWindow.xib
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6249" systemVersion="14A386b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6249"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="CheatController">
@ -241,7 +241,13 @@
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="144">
<customFormatter key="formatter" id="271" customClass="PcsxrHexadecimalFormatter"/>
<customFormatter key="formatter" id="271" customClass="PcsxrHexadecimalFormatter">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="hexPadding">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</customFormatter>
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -258,7 +264,13 @@
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="143">
<customFormatter key="formatter" id="272" customClass="PcsxrHexadecimalFormatter"/>
<customFormatter key="formatter" id="272" customClass="PcsxrHexadecimalFormatter">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="hexPadding">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</customFormatter>
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>

1
macosx/Source/MemBadgeView.h
View File

@ -9,6 +9,7 @@
#import <Cocoa/Cocoa.h>
//TODO: also include the memory count in the view as well.
IB_DESIGNABLE
@interface MemBadgeView : NSView
@end

3
macosx/Source/PcsxrHexadecimalFormatter.h
View File

@ -8,7 +8,8 @@
#import <Foundation/Foundation.h>
IB_DESIGNABLE
@interface PcsxrHexadecimalFormatter : NSFormatter
@property (nonatomic) char hexPadding;
@property (nonatomic) IBInspectable char hexPadding;
@end

5
macosx/Source/PcsxrMemoryObject.m
View File

@ -265,10 +265,7 @@ static inline void SetupAttrStr(NSMutableAttributedString *mutStr, NSColor *txtc
SetupAttrStr(tmpStr, [NSColor blueColor]);
attribMemLabelEndLink = [tmpStr copy];
//tmpStr = [[NSMutableAttributedString alloc] initWithString:@"Multi-save"];
//SetupAttrStr(tmpStr, [NSColor blueColor]);
//attribMemLabelLink = [tmpStr copy];
//RELEASEOBJ(tmpStr);
// Same as attribMemLabelEndLink on release builds
attribMemLabelLink = attribMemLabelEndLink;
//display nothing