SameBoy | Accurate GB/GBC emulator |
| download: https://git.y1.nz/archives/sameboy.tar.gz | |
| README | Files | Log | Refs | LICENSE |
commit 951d0b07f04eeb44635af6a149be1b4d51730bbe parent de9fc76a2ca0e87594922deb74c66526f8625205 Author: Lior Halphon <LIJI32@gmail.com> Date: Sat, 10 Jun 2023 01:19:45 +0300 Give sliders the same treatment Diffstat:
| M | Cocoa/GBPreferenceButton.m | 3 | ++- |
| A | Cocoa/GBPreferencesSlider.h | 6 | ++++++ |
| A | Cocoa/GBPreferencesSlider.m | 29 | +++++++++++++++++++++++++++++ |
| M | Cocoa/GBPreferencesWindow.h | 3 | --- |
| M | Cocoa/GBPreferencesWindow.m | 22 | ---------------------- |
| M | Cocoa/Preferences.xib | 36 | +++++++++++++++++++++--------------- |
6 files changed, 58 insertions(+), 41 deletions(-)
diff --git a/Cocoa/GBPreferenceButton.m b/Cocoa/GBPreferenceButton.m @@ -18,7 +18,8 @@ - (void)setPreferenceName:(NSString *)preferenceName { _preferenceName = preferenceName; - [self observeStandardDefaultsKey:_preferenceName selector:@selector(updateValue)];} + [self observeStandardDefaultsKey:_preferenceName selector:@selector(updateValue)]; +} - (void)viewDidMoveToWindow { diff --git a/Cocoa/GBPreferencesSlider.h b/Cocoa/GBPreferencesSlider.h @@ -0,0 +1,6 @@ +#import <Cocoa/Cocoa.h> + +@interface GBPreferencesSlider : NSSlider +@property (nonatomic) IBInspectable NSString *preferenceName; +@property IBInspectable unsigned denominator; +@end diff --git a/Cocoa/GBPreferencesSlider.m b/Cocoa/GBPreferencesSlider.m @@ -0,0 +1,29 @@ +#import "GBPreferencesSlider.h" +#import "NSObject+DefaultsObserver.h" + +@implementation GBPreferencesSlider + +- (BOOL)sendAction:(SEL)action to:(id)target +{ + [[NSUserDefaults standardUserDefaults] setDouble:self.doubleValue / (self.denominator ?: 1) forKey:_preferenceName]; + return [super sendAction:action to:target]; +} + +- (void)updateValue +{ + if (!_preferenceName) return; + self.doubleValue = [[NSUserDefaults standardUserDefaults] doubleForKey:_preferenceName] * (self.denominator ?: 1); +} + +- (void)setPreferenceName:(NSString *)preferenceName +{ + _preferenceName = preferenceName; + [self observeStandardDefaultsKey:_preferenceName selector:@selector(updateValue)]; +} + +- (void)viewDidMoveToWindow +{ + [super viewDidMoveToWindow]; + [self updateValue]; +} +@end diff --git a/Cocoa/GBPreferencesWindow.h b/Cocoa/GBPreferencesWindow.h @@ -10,9 +10,6 @@ @property IBOutlet NSPopUpButtonCell *bootROMsButton; @property IBOutlet NSPopUpButton *preferredJoypadButton; @property IBOutlet NSPopUpButton *playerListButton; -@property IBOutlet NSSlider *volumeSlider; -@property IBOutlet NSSlider *interferenceSlider; -@property IBOutlet NSSlider *temperatureSlider; @property IBOutlet GBPaletteEditorController *paletteEditorController; @property IBOutlet NSWindow *paletteEditor; @property IBOutlet NSWindow *joyconsSheet; diff --git a/Cocoa/GBPreferencesWindow.m b/Cocoa/GBPreferencesWindow.m @@ -125,25 +125,6 @@ static inline NSString *keyEquivalentString(NSMenuItem *item) previousModifiers = event.modifierFlags; } - -- (IBAction)lightTemperatureChanged:(id)sender -{ - [[NSUserDefaults standardUserDefaults] setObject:@([sender doubleValue] / 256.0) - forKey:@"GBLightTemperature"]; -} - -- (IBAction)interferenceVolumeChanged:(id)sender -{ - [[NSUserDefaults standardUserDefaults] setObject:@([sender doubleValue] / 256.0) - forKey:@"GBInterferenceVolume"]; -} - -- (IBAction)volumeChanged:(id)sender -{ - [[NSUserDefaults standardUserDefaults] setObject:@([sender doubleValue] / 256.0) - forKey:@"GBVolume"]; -} - - (void)updatePalettesMenu { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; @@ -356,9 +337,6 @@ static inline NSString *keyEquivalentString(NSMenuItem *item) else { [_colorPalettePopupButton selectItemWithTitle:[[NSUserDefaults standardUserDefaults] stringForKey:@"GBCurrentTheme"] ?: @""]; } - [_volumeSlider setDoubleValue:[[NSUserDefaults standardUserDefaults] doubleForKey:@"GBVolume"] * 256]; - [_interferenceSlider setDoubleValue:[[NSUserDefaults standardUserDefaults] doubleForKey:@"GBInterferenceVolume"] * 256]; - [_temperatureSlider setDoubleValue:[[NSUserDefaults standardUserDefaults] doubleForKey:@"GBLightTemperature"] * 256]; } - (void)dealloc diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib @@ -77,15 +77,12 @@ <outlet property="highpassFilterPopupButton" destination="T69-6N-dhT" id="B5V-sQ-JmR"/> <outlet property="hotkey1PopupButton" destination="qsH-w5-Rja" id="TFr-p8-IYo"/> <outlet property="hotkey2PopupButton" destination="Ryk-mD-c0y" id="m2J-O5-dng"/> - <outlet property="interferenceSlider" destination="FpE-5i-j5L" id="hfH-e8-7cx"/> <outlet property="joyconsSheet" destination="bn1-MD-iQb" id="rOY-jn-trO"/> <outlet property="paletteEditor" destination="g32-xe-7al" id="WLk-Hh-h5v"/> <outlet property="paletteEditorController" destination="Zxl-vm-6c9" id="uPS-zn-osL"/> <outlet property="playerListButton" destination="gWx-7h-0xq" id="zo6-82-JId"/> <outlet property="preferredJoypadButton" destination="0Az-0R-oNw" id="7JM-tw-BhK"/> <outlet property="skipButton" destination="d2I-jU-sLb" id="udX-8K-0sK"/> - <outlet property="temperatureSlider" destination="NuA-mL-AJZ" id="w11-n7-Bmj"/> - <outlet property="volumeSlider" destination="LNs-v1-Eki" id="DU4-An-OrC"/> </connections> <point key="canvasLocation" x="183" y="354"/> </window> @@ -237,13 +234,16 @@ <userDefinedRuntimeAttribute type="string" keyPath="preferenceName" value="GBColorCorrection"/> </userDefinedRuntimeAttributes> </popUpButton> - <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NuA-mL-AJZ"> + <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NuA-mL-AJZ" customClass="GBPreferencesSlider"> <rect key="frame" x="32" y="226" width="259" height="28"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="-256" maxValue="256" tickMarkPosition="below" numberOfTickMarks="3" sliderType="linear" id="KX7-G9-k0O"/> - <connections> - <action selector="lightTemperatureChanged:" target="QvC-M9-y7g" id="he8-ib-I3Y"/> - </connections> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="denominator"> + <integer key="value" value="256"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="string" keyPath="preferenceName" value="GBLightTemperature"/> + </userDefinedRuntimeAttributes> </slider> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cCm-Oa-FbN"> <rect key="frame" x="18" y="260" width="280" height="17"/> @@ -612,13 +612,16 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LNs-v1-Eki"> + <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LNs-v1-Eki" customClass="GBPreferencesSlider"> <rect key="frame" x="30" y="130" width="262" height="28"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <sliderCell key="cell" continuous="YES" state="on" alignment="left" maxValue="256" doubleValue="256" tickMarkPosition="below" sliderType="linear" id="Xvk-Vj-NHx"/> - <connections> - <action selector="volumeChanged:" target="QvC-M9-y7g" id="4g3-NK-ay4"/> - </connections> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="preferenceName" value="GBVolume"/> + <userDefinedRuntimeAttribute type="number" keyPath="denominator"> + <integer key="value" value="256"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> </slider> <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="T69-6N-dhT" customClass="GBPreferencePopUpButton"> <rect key="frame" x="30" y="74" width="229" height="26"/> @@ -658,13 +661,16 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FpE-5i-j5L"> + <slider verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FpE-5i-j5L" customClass="GBPreferencesSlider"> <rect key="frame" x="30" y="18" width="262" height="28"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <sliderCell key="cell" continuous="YES" state="on" alignment="left" maxValue="256" tickMarkPosition="below" sliderType="linear" id="Rbx-DU-xYf"/> - <connections> - <action selector="interferenceVolumeChanged:" target="QvC-M9-y7g" id="HFU-0q-hj1"/> - </connections> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="string" keyPath="preferenceName" value="GBInterferenceVolume"/> + <userDefinedRuntimeAttribute type="number" keyPath="denominator"> + <integer key="value" value="256"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> </slider> <button horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Ub-0B-W2H"> <rect key="frame" x="266" y="74" width="25" height="25"/>
This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.