mirror of
https://github.com/ksherlock/ample.git
synced 2024-10-31 15:04:56 +00:00
1b7faf3ac4
There are still a couple minor UI degradations eg: mame cheat sheet, recent disk images window, auto complete window. Squashed commit of the following: commit fb115024f805da38b747fd1905573fabb7bff24e Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 18:00:13 2021 -0400 ? commit 8405f4df95ae8f5bc5dc33598dc0b3f8972b32cd Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 17:59:43 2021 -0400 tintColor not present before 10.14 commit 86a6102cee4f30cac2972259ef55fda3c32b8f9a Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 17:59:19 2021 -0400 [menu setItemArray:] apparently has problems before 10.14 commit 65227a00743fbf143c623af8a76698d57bdc4573 Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 17:58:15 2021 -0400 NSCache doesn't like null objects. commit 8a4c3a4662647d5ee0b609bde9f3aaa5c0d99776 Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 16:00:05 2021 -0400 organize copy bundle resources. multiple-sized png images are converted to a single tiff (with multiple sizes). This is fine BUT EL capitan grabs the first image so if the @3x image is first, it will be used. commit 44b94cdfd47117864b6529214b1c91a0c2e41327 Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 15:57:37 2021 -0400 add NewSlotViewController.m to Ample Lite. commit 2fa1b7418783e48ca625ab3490e43cbff9e5619a Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 13:57:19 2021 -0400 Ample Lite was missing reference to New Slot View nib. commit 65f268e77a65f8c57019702d8f0c2b66577c5ee7 Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 13:56:04 2021 -0400 based on testing, 10.11 still has public.file-url, which is kUTTypeFileURL. 10.13 added NSURLPBoardType as a synonym. commit cde123b16eb336b7695b444931b9e9bb9802d772 Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sun May 30 13:54:02 2021 -0400 set everything to 10.11 commite7a670efd3
Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sat May 29 23:33:31 2021 -0400 script to download SDL2.Framework commit9f38f2972a
Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sat May 29 22:15:32 2021 -0400 WKWebView apparently has a bug prior to 10.12 so it can't be created via a nib. commite18aea7249
Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Sat May 29 22:14:38 2021 -0400 version checks for features not present in 10.11 commit07dcf30f52
Author: Kelvin Sherlock <ksherlock@gmail.com> Date: Fri May 28 21:30:53 2021 -0400 lower target to 10.11
62 lines
1.5 KiB
Objective-C
62 lines
1.5 KiB
Objective-C
//
|
|
// CheatSheetWindowController.m
|
|
// Ample
|
|
//
|
|
// Created by Kelvin Sherlock on 1/14/2021.
|
|
// Copyright © 2021 Kelvin Sherlock. All rights reserved.
|
|
//
|
|
|
|
#import "CheatSheetWindowController.h"
|
|
|
|
#import <WebKit/WebKit.h>
|
|
|
|
@interface CheatSheetWindowController ()
|
|
@property (weak) IBOutlet WKWebView *webView;
|
|
|
|
@end
|
|
|
|
@interface CheatSheetWindowController (NavigationDelegate) <WKNavigationDelegate>
|
|
@end
|
|
|
|
@implementation CheatSheetWindowController
|
|
|
|
-(NSString *)windowNibName {
|
|
return @"CheatSheet";
|
|
}
|
|
|
|
- (void)windowDidLoad {
|
|
[super windowDidLoad];
|
|
|
|
if (!_webView) {
|
|
WKWebView *webView;
|
|
NSWindow *window = [self window];
|
|
CGRect frame = [[window contentView] frame];
|
|
|
|
|
|
webView = [WKWebView new];
|
|
[webView setFrame: frame];
|
|
[webView setNavigationDelegate: self];
|
|
[[window contentView]addSubview: webView];
|
|
_webView = webView;
|
|
}
|
|
|
|
|
|
[_webView setHidden: YES];
|
|
NSBundle *bundle = [NSBundle mainBundle];
|
|
NSURL *url = [bundle URLForResource: @"CheatSheet" withExtension: @"html"];
|
|
//[[[_webView configuration] preferences] setValue: @YES forKey: @"developerExtrasEnabled"];
|
|
[_webView loadFileURL: url allowingReadAccessToURL: url];
|
|
|
|
}
|
|
|
|
-(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
|
|
// delay to prevent flash in dark mode.
|
|
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0/8 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
|
[webView setHidden: NO];
|
|
});
|
|
|
|
}
|
|
|
|
|
|
@end
|