diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java index e0426508..25873c51 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java @@ -23,7 +23,8 @@ public class UIKit { // trigger static init clazz.getField("isMacOS").get(null); } catch (Throwable e) { - e.printStackTrace(); + System.out.println("Skipped patch_FlatLAF_setLinux"); + //e.printStackTrace(); } System.setProperty("os.name", osName); } diff --git a/Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json b/Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json new file mode 100644 index 00000000..1ffad00d --- /dev/null +++ b/Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "icon.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Natives/Assets.xcassets/MenuCustomControls.imageset/icon.png b/Natives/Assets.xcassets/MenuCustomControls.imageset/icon.png new file mode 100644 index 00000000..14ec8785 Binary files /dev/null and b/Natives/Assets.xcassets/MenuCustomControls.imageset/icon.png differ diff --git a/Natives/Assets.xcassets/MenuInstallJar.imageset/Contents.json b/Natives/Assets.xcassets/MenuInstallJar.imageset/Contents.json new file mode 100644 index 00000000..1ffad00d --- /dev/null +++ b/Natives/Assets.xcassets/MenuInstallJar.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "icon.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Natives/Assets.xcassets/MenuInstallJar.imageset/icon.png b/Natives/Assets.xcassets/MenuInstallJar.imageset/icon.png new file mode 100644 index 00000000..c8fba25f Binary files /dev/null and b/Natives/Assets.xcassets/MenuInstallJar.imageset/icon.png differ diff --git a/Natives/Assets.xcassets/MenuNews.imageset/ic_menu_news.png b/Natives/Assets.xcassets/MenuNews.imageset/ic_menu_news.png index 5fdcc075..e6ceb02f 100644 Binary files a/Natives/Assets.xcassets/MenuNews.imageset/ic_menu_news.png and b/Natives/Assets.xcassets/MenuNews.imageset/ic_menu_news.png differ diff --git a/Natives/Assets.xcassets/MenuSettings.imageset/ic_menu_settings.png b/Natives/Assets.xcassets/MenuSettings.imageset/ic_menu_settings.png index cda0fed9..a74ea6ad 100644 Binary files a/Natives/Assets.xcassets/MenuSettings.imageset/ic_menu_settings.png and b/Natives/Assets.xcassets/MenuSettings.imageset/ic_menu_settings.png differ diff --git a/Natives/CustomControlsViewController.m b/Natives/CustomControlsViewController.m index b7173fcf..7ae3d6f9 100644 --- a/Natives/CustomControlsViewController.m +++ b/Natives/CustomControlsViewController.m @@ -1139,8 +1139,6 @@ CGFloat currentY; } - (void)closeTextField { - [self.editSizeWidth endEditing:YES]; - [self.editSizeHeight endEditing:YES]; [self.editMapping endEditing:YES]; } diff --git a/Natives/LauncherMenuViewController.m b/Natives/LauncherMenuViewController.m index c24fa88f..3c6fb601 100644 --- a/Natives/LauncherMenuViewController.m +++ b/Natives/LauncherMenuViewController.m @@ -53,7 +53,7 @@ }], [LauncherMenuCustomItem title:localize(@"login.menu.sendlogs", nil) - imageName:@"MenuSendLog" action:^{ + imageName:@"square.and.arrow.up" action:^{ [self restoreHighlightedSelection]; NSString *latestlogPath = [NSString stringWithFormat:@"file://%s/latestlog.old.txt", getenv("POJAV_HOME")]; NSLog(@"Path is %@", latestlogPath); @@ -117,9 +117,17 @@ } cell.textLabel.text = [self.options[indexPath.row] title]; - cell.imageView.contentMode = UIViewContentModeCenter; - cell.imageView.image = [UIImage imageNamed:[self.options[indexPath.row] - performSelector:@selector(imageName)]]; + //cell.imageView.contentMode = UIViewContentModeScaleToFill; + if (@available(iOS 13.0, *)) { + cell.imageView.image = [UIImage systemImageNamed:[self.options[indexPath.row] + performSelector:@selector(imageName)]]; + } + if (cell.imageView.image == nil) { + cell.imageView.layer.magnificationFilter = kCAFilterNearest; + cell.imageView.layer.minificationFilter = kCAFilterNearest; + cell.imageView.image = [UIImage imageNamed:[self.options[indexPath.row] + performSelector:@selector(imageName)]]; + } return cell; } diff --git a/Natives/input_bridge_v3.m b/Natives/input_bridge_v3.m index 1d056d63..7e7097b8 100644 --- a/Natives/input_bridge_v3.m +++ b/Natives/input_bridge_v3.m @@ -432,7 +432,7 @@ void CallbackBridge_nativeSendMouseButton(int button, int action, int mods) { isPrepareGrabPos = true; } else if (GLFW_invoke_MouseButton) { if (mods == 0) { - mods = getKeyModifiers(key, action); + mods = getKeyModifiers(0, action); } if (isUseStackQueueCall) {