diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift index 2b723131..6992479f 100644 --- a/VoidLink/Input/OnScreenWidgetView.swift +++ b/VoidLink/Input/OnScreenWidgetView.swift @@ -3139,9 +3139,7 @@ import ObjectiveC.runtime restartAutoDockCountdown() return } - if hasUnfoldedSubfolders() { - return - } + // if hasUnfoldedSubfolders() {return} self.isUserInteractionEnabled = false guard let hostView = superview, diff --git a/VoidLink/Localization/Localizable.xcstrings b/VoidLink/Localization/Localizable.xcstrings index 6bdd183e..a2b0a020 100644 --- a/VoidLink/Localization/Localizable.xcstrings +++ b/VoidLink/Localization/Localizable.xcstrings @@ -4630,25 +4630,25 @@ "en" : { "stringUnit" : { "state" : "translated", - "value" : "\n1. By default, The widget menu button will be automatically docked to edge after staying idle for 10 seconds.\n\n2. From %@ edge, slide %d%% screen width to open settings menu\n\n3. Slide from top 40%% of screen edge to avoid sending touch events to PC side" + "value" : "\n1. By default, The widget menu button will be automatically docked to edge, then become almost transparent after staying idle for 10 seconds.\n\n2. From %@ edge, slide %d%% screen width to open settings menu\n\n3. Slide from top 40%% of screen edge to avoid sending touch events to PC side" } }, "zh-Hans" : { "stringUnit" : { "state" : "translated", - "value" : "\n1. 默认状态下,控件菜单按键在闲置10秒后将自动吸附屏幕边缘\n\n2. 展开设置菜单: 从%@边缘滑动%d%%屏幕宽度\n\n3. 从40%%上半边缘滑动避免触控事件影响PC端" + "value" : "\n1. 默认状态下,控件菜单按键在闲置10秒后将自动吸附屏幕右边缘,并进入高透明状态。\n\n2. 展开设置菜单: 从%@边缘滑动%d%%屏幕宽度\n\n3. 从40%%上半边缘滑动避免触控事件影响PC端" } }, "zh-Hant" : { "stringUnit" : { "state" : "translated", - "value" : "\n1. 預設狀態下,控件選單按鍵在閒置 10 秒後將自動吸附螢幕邊緣\n\n2. 展開設定選單:從%@邊緣滑動%d%%的螢幕寬度\n\n3. 從螢幕邊緣上方40%%處滑動以避免將觸控事件傳送到電腦端" + "value" : "\n1. 預設狀態下,控件選單按鍵在閒置 10 秒後將自動吸附螢幕右邊緣,並進入高透明狀態\n\n2. 展開設定選單:從%@邊緣滑動%d%%的螢幕寬度\n\n3. 從螢幕邊緣上方40%%處滑動以避免將觸控事件傳送到電腦端" } }, "zh-HK" : { "stringUnit" : { "state" : "translated", - "value" : "\n1. 預設狀態下,控件選單按鍵在閒置 10 秒後將自動吸附螢幕邊緣\n\n2. 展開設定選單:從%@邊緣滑動%d%%的螢幕寬度\n\n3. 從螢幕邊緣上方40%%處滑動以避免將觸控事件傳送到電腦端" + "value" : "\n1. 預設狀態下,控件選單按鍵在閒置 10 秒後將自動吸附螢幕右邊緣,並進入高透明狀態\n\n2. 展開設定選單:從%@邊緣滑動%d%%的螢幕寬度\n\n3. 從螢幕邊緣上方40%%處滑動以避免將觸控事件傳送到電腦端" } } } diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift index 49a3b0cc..62f63964 100644 --- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift +++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift @@ -712,7 +712,7 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg if widgetView !== selectedWidgetView { selectedWidgetView?.setAutoTapIntervalByText(str: autoTapField.text ?? "") } - selectedWidgetView = widgetView + widgetView.hideAllHighlightLayersOfAllWidgets(selfIncluded: true) autoFitLabel(currentProfileLabel) @@ -870,7 +870,7 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg bulkMoveSelector.selectedSegmentIndex = 0 } - setBulkEditStackHidden(!bulkEditEnabled) + setBulkEditStackHidden(!(bulkEditEnabled && widgetView.isFolder && !widgetView.folded)) if isIPhone() { vibrationStyleStack.isHidden = !widgetView.hasHapticFeedback @@ -881,7 +881,12 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg @objc private func widgetViewTapped(_ notification: Notification) { guard let widgetView = notification.object as? OnScreenWidgetView else { return } + selectedWidgetView = widgetView layoutOSC.updateGuidelinesFor(onScreenWidget: widgetView) + if bulkEditEnabled { + bulkEditButtonTapped(bulkEditButton) // this will call refreshPanelForSelectedWidget too + return + } refreshPanelForSelectedWidget(widgetView) } diff --git a/VoidLink/ViewControllers/StreamFrameViewController.m b/VoidLink/ViewControllers/StreamFrameViewController.m index 4e9d929a..a775564a 100644 --- a/VoidLink/ViewControllers/StreamFrameViewController.m +++ b/VoidLink/ViewControllers/StreamFrameViewController.m @@ -577,7 +577,7 @@ message:tipText withCancel:NO buttonTitle:[LocalizationHelper localizedStringForKey:@"Got it!"] - countdown:16 + countdown:11 action:^{} completion:^{}];