SameBoy | Accurate GB/GBC emulator |
| download: https://git.y1.nz/archives/sameboy.tar.gz | |
| README | Files | Log | Refs | LICENSE |
commit 86a1977034a08cce13f4677e110e7ee06e46c36f parent 9fe965bcc2e116dd819cb60aa69bc8d7a0b9725a Author: Lior Halphon <LIJI32@gmail.com> Date: Sun, 13 Mar 2022 01:14:29 +0200 Visual updates for Big Sur and newer Diffstat:
23 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Cocoa/AppDelegate.m b/Cocoa/AppDelegate.m @@ -154,6 +154,10 @@ static uint32_t color_to_int(NSColor *color) #ifndef UPDATE_SUPPORT [_preferencesWindow.toolbar removeItemAtIndex:4]; #endif + if (@available(macOS 11.0, *)) { + [_preferencesWindow.toolbar insertItemWithItemIdentifier:NSToolbarFlexibleSpaceItemIdentifier atIndex:0]; + [_preferencesWindow.toolbar insertItemWithItemIdentifier:NSToolbarFlexibleSpaceItemIdentifier atIndex:_preferencesWindow.toolbar.items.count]; + } } [_preferencesWindow makeKeyAndOrderFront:self]; } diff --git a/Cocoa/CPU~solid.png b/Cocoa/CPU~solid.png Binary files differ. diff --git a/Cocoa/CPU~solid@2x.png b/Cocoa/CPU~solid@2x.png Binary files differ. diff --git a/Cocoa/CPU~solid~dark.png b/Cocoa/CPU~solid~dark.png Binary files differ. diff --git a/Cocoa/CPU~solid~dark@2x.png b/Cocoa/CPU~solid~dark@2x.png Binary files differ. diff --git a/Cocoa/Display~solid.png b/Cocoa/Display~solid.png Binary files differ. diff --git a/Cocoa/Display~solid@2x.png b/Cocoa/Display~solid@2x.png Binary files differ. diff --git a/Cocoa/Display~solid~dark.png b/Cocoa/Display~solid~dark.png Binary files differ. diff --git a/Cocoa/Display~solid~dark@2x.png b/Cocoa/Display~solid~dark@2x.png Binary files differ. diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib @@ -507,7 +507,7 @@ <rect key="frame" x="0.0" y="0.0" width="512" height="432"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vhq-K4-baH"> + <scrollView fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vhq-K4-baH"> <rect key="frame" x="0.0" y="0.0" width="512" height="432"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <clipView key="contentView" ambiguous="YES" id="JYu-CM-49p"> @@ -522,8 +522,8 @@ <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/> </clipView> <edgeInsets key="contentInsets" left="0.0" right="0.0" top="0.0" bottom="0.0"/> - <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="zUB-xg-cXq"> - <rect key="frame" x="0.0" y="416" width="512" height="16"/> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="zUB-xg-cXq"> + <rect key="frame" x="-100" y="-100" width="512" height="16"/> <autoresizingMask key="autoresizingMask"/> </scroller> <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="jMe-gO-ERw"> diff --git a/Cocoa/GBPreferencesWindow.m b/Cocoa/GBPreferencesWindow.m @@ -65,7 +65,7 @@ - (NSWindowToolbarStyle)toolbarStyle { - return NSWindowToolbarStylePreference; + return NSWindowToolbarStyleExpanded; } - (void)close diff --git a/Cocoa/Joypad~solid.png b/Cocoa/Joypad~solid.png Binary files differ. diff --git a/Cocoa/Joypad~solid@2x.png b/Cocoa/Joypad~solid@2x.png Binary files differ. diff --git a/Cocoa/NSImageNamedDarkSupport.m b/Cocoa/NSImageNamedDarkSupport.m @@ -11,6 +11,13 @@ static NSImage * (*imageNamed)(Class self, SEL _cmd, NSString *name); + (NSImage *)imageNamedWithDark:(NSImageName)name { + if (@available(macOS 11.0, *)) { + if (![name containsString:@"~solid"]) { + NSImage *solid = [self imageNamed:[name stringByAppendingString:@"~solid"]]; + [solid setTemplate:true]; + if (solid) return solid; + } + } NSImage *light = imageNamed(self, _cmd, name); if (@available(macOS 10.14, *)) { NSImage *dark = imageNamed(self, _cmd, [name stringByAppendingString:@"~dark"]); diff --git a/Cocoa/Preferences.xib b/Cocoa/Preferences.xib @@ -52,7 +52,7 @@ <action selector="switchPreferencesTab:" target="-2" id="Tio-D7-PaA"/> </connections> </toolbarItem> - <toolbarItem implicitItemIdentifier="EB7AB5BC-57B0-4639-A037-E28226866C80" label="Updates" paletteLabel="Updates" tag="4" image="AppIcon" autovalidates="NO" selectable="YES" id="lMV-68-ntz"> + <toolbarItem implicitItemIdentifier="EB7AB5BC-57B0-4639-A037-E28226866C80" label="Updates" paletteLabel="Updates" tag="4" image="Updates" autovalidates="NO" selectable="YES" id="lMV-68-ntz"> <connections> <action selector="switchPreferencesTab:" target="-2" id="bfU-hc-FnN"/> </connections> @@ -1113,12 +1113,12 @@ </customObject> </objects> <resources> - <image name="AppIcon" width="512" height="512"/> <image name="CPU" width="32" height="32"/> <image name="Display" width="32" height="32"/> <image name="Joypad" width="32" height="32"/> <image name="NSAddTemplate" width="11" height="11"/> <image name="NSRemoveTemplate" width="11" height="11"/> <image name="Speaker" width="32" height="32"/> + <image name="Updates" width="32" height="32"/> </resources> </document> diff --git a/Cocoa/Speaker~solid.png b/Cocoa/Speaker~solid.png Binary files differ. diff --git a/Cocoa/Speaker~solid@2x.png b/Cocoa/Speaker~solid@2x.png Binary files differ. diff --git a/Cocoa/Updates.png b/Cocoa/Updates.png Binary files differ. diff --git a/Cocoa/Updates@2x.png b/Cocoa/Updates@2x.png Binary files differ. diff --git a/Cocoa/Updates~solid.png b/Cocoa/Updates~solid.png Binary files differ. diff --git a/Cocoa/Updates~solid@2x.png b/Cocoa/Updates~solid@2x.png Binary files differ. diff --git a/Cocoa/Updates~solid~dark.png b/Cocoa/Updates~solid~dark.png Binary files differ. diff --git a/Cocoa/Updates~solid~dark@2x.png b/Cocoa/Updates~solid~dark@2x.png Binary files differ.
This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.