From b0842ea4dc31b93587480ca8c2bbb4dc1068df66 Mon Sep 17 00:00:00 2001 From: True Zhuanjia Date: Wed, 8 Apr 2026 00:21:55 +0800 Subject: [PATCH] autoDock fixes --- VoidLink/Input/OnScreenWidgetView.swift | 2 ++ VoidLink/Input/StreamView.m | 2 +- .../LayoutOnScreenControlsViewController.swift | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift index 6992479f..5e7f7c99 100644 --- a/VoidLink/Input/OnScreenWidgetView.swift +++ b/VoidLink/Input/OnScreenWidgetView.swift @@ -3135,6 +3135,8 @@ import ObjectiveC.runtime } private func autoDockWidgetToNearestEdge() { + guard autoDockEnabled else {return} + if !folded { restartAutoDockCountdown() return diff --git a/VoidLink/Input/StreamView.m b/VoidLink/Input/StreamView.m index 2b9e44c5..c75b184c 100644 --- a/VoidLink/Input/StreamView.m +++ b/VoidLink/Input/StreamView.m @@ -694,7 +694,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5; widgetView.gamepadOverlayFLag = oscProfile.gamepadOverlayEnabled; [widgetView setupAtrributedText]; - [widgetView setAutoDockEnabled:widgetView.isFolder && widgetView.parentSequence < 0 && widgetView.autoDockIdleDuration>0]; + if(widgetView.isFolder && widgetView.parentSequence<0 && widgetView.autoDockIdleDuration>0) [widgetView setAutoDockEnabled:true]; if(sequenceGenerated){ // NSLog(@"widgetView.sequence %d %f", widgetView.sequence, CACurrentMediaTime()); diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift index 47b2c57b..7c0a8a75 100644 --- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift +++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift @@ -1737,7 +1737,7 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg @objc private func autoDockTimerSliderMoved(_ sender: UISlider) { guard let selectedWidget = selectedWidgetView else {return} selectedWidget.autoDockIdleDuration = TimeInterval(Int(sender.value)) - autoDockTimerLabel.text = sender.value == 0 ? LocalizationHelper.localizedString(forKey: "Auto dock disabled", Int(sender.value)) : LocalizationHelper.localizedString(forKey: "Auto dock: %d s", Int(sender.value)) + autoDockTimerLabel.text = Int(sender.value) == 0 ? LocalizationHelper.localizedString(forKey: "Auto dock disabled", Int(sender.value)) : LocalizationHelper.localizedString(forKey: "Auto dock: %d s", Int(sender.value)) return }