Apple-2-Tools
/
ample
mirror of https://github.com/ksherlock/ample.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fixes 

1. remove old and unused properties
2. add mouse capture checkbox
3. disable square pixels checkbox in full screen mode
This commit is contained in:
Kelvin Sherlock 2020-09-13 12:04:54 -04:00
parent 8362692523
commit 2ab55c0454
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Ample/Base.lproj/LaunchWindow.xib
View File

@ -115,7 +115,7 @@ DQ
</textField> </textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ctE-fX-twN"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ctE-fX-twN">
<rect key="frame" x="318" y="92" width="51" height="16"/> <rect key="frame" x="318" y="92" width="51" height="16"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Effects:" id="Sqk-7k-PxQ"> <textFieldCell key="cell" lineBreakMode="clipping" title="Effects:" id="Sqk-7k-PxQ">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -162,6 +162,7 @@ DQ
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<binding destination="-2" name="enabled" keyPath="self.mameWindowMode" id="X80-2K-kTO"/>
<binding destination="-2" name="value" keyPath="self.mameSquarePixels" id="BiP-wC-Hpn"/> <binding destination="-2" name="value" keyPath="self.mameSquarePixels" id="BiP-wC-Hpn"/>
</connections> </connections>
</button> </button>
@ -192,6 +193,17 @@ DQ
<binding destination="-2" name="selectedIndex" keyPath="self.mameWindowMode" id="B9e-SK-3RY"/> <binding destination="-2" name="selectedIndex" keyPath="self.mameWindowMode" id="B9e-SK-3RY"/>
</connections> </connections>
</popUpButton> </popUpButton>
<button verticalHuggingPriority="750" id="9Db-wA-FP9">
<rect key="frame" x="15" y="29" width="115" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Capture Mouse" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="3xh-Q7-WFl">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="self.mameMouse" id="vWu-od-2d6"/>
</connections>
</button>
</subviews> </subviews>
</view> </view>
</tabViewItem> </tabViewItem>

20
Ample/LaunchWindowController.m
View File

@ -31,11 +31,9 @@ static NSString *kContextMachine = @"kContextMachine";
@property NSArray *args; @property NSArray *args;
@property NSString *mameMachine; @property NSString *mameMachine;
@property BOOL mameWindow;
@property BOOL mameNoThrottle;
@property BOOL mameDebug; @property BOOL mameDebug;
@property BOOL mameSquarePixels; @property BOOL mameSquarePixels;
@property BOOL mameNoBlur; @property BOOL mameMouse;
@property BOOL mameAVI; @property BOOL mameAVI;
@property BOOL mameWAV; @property BOOL mameWAV;
@ -66,6 +64,7 @@ static NSString *kContextMachine = @"kContextMachine";
-(void)windowWillLoad { -(void)windowWillLoad {
[self setMameSpeed: 1]; [self setMameSpeed: 1];
[self setMameBGFX: YES]; [self setMameBGFX: YES];
[self setMameMouse: NO];
} }
- (void)windowDidLoad { - (void)windowDidLoad {
@ -80,9 +79,10 @@ static NSString *kContextMachine = @"kContextMachine";
NSArray *keys = @[ NSArray *keys = @[
@"mameMachine", @"mameWindow", @"mameSquarePixels", @"mameNoBlur", @"mameWindowMode", @"mameMachine", @"mameSquarePixels", @"mameWindowMode",
@"mameMouse",
@"mameDebug", @"mameDebug",
@"mameSpeed", // @"mameNoThrottle", @"mameSpeed",
@"mameAVI", @"mameAVIPath", @"mameAVI", @"mameAVIPath",
@"mameWAV", @"mameWAVPath", @"mameWAV", @"mameWAVPath",
@"mameVGM", @"mameVGMPath", @"mameVGM", @"mameVGMPath",
@ -236,11 +236,16 @@ static NSString * JoinArguments(NSArray *argv) {
//[argv addObject: @"mame"]; //[argv addObject: @"mame"];
[argv addObject: _mameMachine]; [argv addObject: _mameMachine];
// -confirm_quit?
[argv addObject: @"-skip_gameinfo"];
if (_mameMouse)
[argv addObject: @"-mouse"]; // capture the mouse cursor when over the window.
if (_mameDebug) [argv addObject: @"-debug"]; if (_mameDebug) [argv addObject: @"-debug"];
// -confirm_quit
[argv addObject: @"-skip_gameinfo"];
/* /*
@ -328,7 +333,6 @@ static NSString * JoinArguments(NSArray *argv) {
[argv addObjectsFromArray: tmp]; [argv addObjectsFromArray: tmp];
} }
//if (_mameNoThrottle) [argv addObject: @"-nothrottle"];
if (_mameSpeed < 0) { if (_mameSpeed < 0) {
[argv addObject: @"-nothrottle"]; [argv addObject: @"-nothrottle"];
} else if (_mameSpeed > 1) { } else if (_mameSpeed > 1) {