minor tweak and fixes

2026-08-03 11:10:30 +08:00
parent 54ac7f6522
commit 660a015f8b
10 changed files with 87 additions and 9 deletions
@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "apple.terminal.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generator: Apple Native CoreSVG 341-->
+<!DOCTYPE svg
+PUBLIC "-//W3C//DTD SVG 1.1//EN"
+       "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 30.5252 23.9534">
+ <g>
+  <rect height="23.9534" opacity="0" width="30.5252" x="0" y="0"/>
+  <path d="M4.30122 23.9534L25.8685 23.9534C28.6839 23.9534 30.1697 22.4762 30.1697 19.6955L30.1697 4.27466C30.1697 1.48987 28.6839 0.00807405 25.8685 0.00807405L4.30122 0.00807405C1.49449 0.00807405 0 1.48987 0 4.27466L0 19.6955C0 22.4762 1.49449 23.9534 4.30122 23.9534ZM4.53653 21.1263C3.42444 21.1263 2.82713 20.5624 2.82713 19.3955L2.82713 4.57058C2.82713 3.40367 3.42444 2.8352 4.53653 2.8352L25.6332 2.8352C26.7366 2.8352 27.3426 3.40367 27.3426 4.57058L27.3426 19.3955C27.3426 20.5624 26.7366 21.1263 25.6332 21.1263Z" fill="white" fill-opacity="0.85"/>
+  <path d="M5.97169 10.1889C4.79979 10.8986 5.79916 12.6879 7.08069 11.8853L10.6199 9.66475C11.4444 9.14716 11.4104 7.92273 10.6199 7.42649L7.08069 5.214C5.80319 4.40735 4.79113 6.19202 5.96765 6.90232L8.69215 8.54533ZM11.2928 11.7555C11.2928 12.2887 11.7209 12.7295 12.2708 12.7295L16.9785 12.7295C17.5244 12.7295 17.9485 12.2887 17.9485 11.7555C17.9485 11.2057 17.5244 10.7729 16.9785 10.7729L12.2708 10.7729C11.7249 10.7729 11.2928 11.2057 11.2928 11.7555Z" fill="white" fill-opacity="0.85"/>
+ </g>
+</svg>
@@ -609,8 +609,8 @@ final class ControllerNavigator: NSObject {
                RadialMenuOverlayView.menuSectors.removeAll()
                
                if radialMenuState == .disconnectAndQuit {
-                    RadialMenuOverlayView.menuSectors.append(RadialMenuSector(title: "Disconnect".localized, subtitle: "", symbol: PublicUtils.disconnectSymbol(), item: .disconnect))
                    RadialMenuOverlayView.menuSectors.append(RadialMenuSector(title: "Quit App".localized, subtitle: "", symbol: PublicUtils.quitSymbol(), item: .quitApp))
+                    RadialMenuOverlayView.menuSectors.append(RadialMenuSector(title: "Disconnect".localized, subtitle: "", symbol: PublicUtils.disconnectSymbol(), item: .disconnect))
                    radialMenuView = RadialMenuOverlayView.presentInKeyWindow()
                    listenToRadialMenuStick()
                    return
@@ -651,7 +651,7 @@ final class ControllerNavigator: NSObject {
                    }
                }
                
-                if !mainFrameVC.settingsViewExpanded {RadialMenuOverlayView.menuSectors.append(RadialMenuSector(title: "More".localized, subtitle: "", symbol: "ellipsis.circle", item: .more))}
+                if !mainFrameVC.settingsViewExpanded {RadialMenuOverlayView.menuSectors.append(RadialMenuSector(title: "=more".localized, subtitle: "", symbol: "ellipsis.circle", item: .more))}

                if !mainFrameVC.isStreaming() || radialMenuState == .moreOptions { RadialMenuOverlayView.menuSectors.appendIfNotContains(gameProfileItem)
                }
@@ -1029,7 +1029,7 @@ extension SettingsViewController: ControllerUINavigationDelegate {
            })
        }
        controllerMouseCurvePreviewDismissWorkItem = workItem
-        DispatchQueue.main.asyncAfter(deadline: .now() + 2, execute: workItem)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: workItem)
    }

    @objc func restoreControllerNavigationHighlight() {
@@ -1828,7 +1828,7 @@ import ObjectiveC.runtime
                autoReleaseComboButtons.removeAll{
                    Set(CommandManager.pencilProButtonCmds).contains($0)
                }
-                CommandManager.shared.sendAutoReleaseComboCommand(cmdStrings: autoReleaseComboButtons) // send multi-key command
+                CommandManager.shared.sendAutoReleaseComboCommand(cmdStrings: autoReleaseComboButtons, delay: 0.1) // send multi-key command
            }
            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                self.buttonUpVisualEffect()
@@ -2513,6 +2513,35 @@
        }
      }
    },
+    "=more" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "More"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "其他"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "其他"
+          }
+        },
+        "zh-HK" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "其他"
+          }
+        }
+      }
+    },
    "=mouseM" : {
      "extractionState" : "manual",
      "localizations" : {
@@ -209,6 +209,11 @@ import UIKit
        return rootViewController
    }
    
+    @objc public static func hasNoPresentedVC(_ vc: UIViewController) -> Bool {
+        let hasNoPresentedVC = vc.presentedViewController == nil && vc.view.window != nil
+        return hasNoPresentedVC
+    }
+    
    public static func runOnMain(_ work: @escaping () -> Void) {
        if Thread.isMainThread {
            work()
@@ -1016,6 +1016,7 @@ static NSMutableSet* hostList;

 - (void)quitApp:(TemporaryApp* )app{
    if(!app) return;
+    if(![PublicUtils hasNoPresentedVC:self]) return;
    [self showLoadingFrame: ^{
        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
            HttpResponse* quitResponse = [self requestToQuitApp:app];
@@ -633,8 +633,9 @@ BOOL isCustomResolution(int resolutionSelected) {
    
    if(!settingsViewAlreadyAppeared) {
        if(![self contentOffsetRestored]) _scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x, tempSettings.settingsMenuOffset.floatValue);
-        if(@available(iOS 13.0, *)) if(ControllerUtil.primaryGCController) [self restoreControllerNavigationHighlight];
    }
+    if(@available(iOS 13.0, *)) if(ControllerUtil.primaryGCController) [self restoreControllerNavigationHighlight];
+    
    _scrollView.hidden = false;
    
    settingsViewJustExpanded = false;
@@ -1374,7 +1374,13 @@ static __weak StreamFrameViewController *VLSharedStreamFrameViewController = nil
        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.15 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
            if(ControllerNavigator.radialMenuView) [ControllerNavigator updateRadialMenu];
        });
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [ControllerNavigator restoreUINavigationHighlight];
+        });
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [ControllerNavigator restoreUINavigationHighlight];
+        });
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
            [ControllerNavigator restoreUINavigationHighlight];
        });
    }
@@ -377,7 +377,7 @@ private struct RadialMenuCenterView: View {
                .padding(.bottom, centerIconTitleSpacing)

            Text(item?.title ?? "")
-                .font(.system(size: max(diameter * 0.047, 13), weight: .medium))
+                .font(.system(size: max(diameter * 0.047, 13), weight: .semibold))
                .foregroundColor(style.titleColor)
                .lineLimit(1)
                .minimumScaleFactor(0.62)
@@ -400,7 +400,7 @@ private struct RadialMenuCenterView: View {
    }

    private var centerTextSpacing: CGFloat {
-        max(diameter * 0.018, 4)
+        max(diameter * 0.013, 3.3)
    }

    private var centerIconTitleSpacing: CGFloat {
@@ -408,7 +408,7 @@ private struct RadialMenuCenterView: View {
            return centerTextSpacing
        }

-        return max(diameter * 0.034, 8)
+        return 3.6
    }
 }