hermes-agent/VoidLink
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes for absolute touch mode

Browse Source
This commit is contained in:
True Zhuanjia committed 2026-05-26 15:05:10 +08:00
1 parent 23299ad73d
commit c4ddc0c4fc
3 files changed
+11 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VoidLink/Input/OnScreenWidgetView.swift
+3 -3
View File
@@ -482,10 +482,10 @@ import ObjectiveC.runtime
self.widgetType = WidgetTypeEnum.button // legacy combo button connected by "+" self.widgetType = WidgetTypeEnum.button // legacy combo button connected by "+"
} }
print("widgetType: \(self.widgetType)") // print("widgetType: \(self.widgetType)")
print("touchPadString: \(self.touchPadString)") // print("touchPadString: \(self.touchPadString)")
for comboButtonString in comboButtonStrings { for comboButtonString in comboButtonStrings {
print("comboButtonString: \(comboButtonString)") // print("comboButtonString: \(comboButtonString)")
} }
self.widgetLabel = buttonLabel self.widgetLabel = buttonLabel
VoidLink/ViewControllers/MainFrameViewController.h
-1
View File
@@ -27,7 +27,6 @@
#if !TARGET_OS_TV #if !TARGET_OS_TV
@property (nonatomic, assign) bool settingsExpandedInStreamView; @property (nonatomic, assign) bool settingsExpandedInStreamView;
@property (nonatomic, assign) bool sessionLaunchedWithAbsoluteTouch;
@property (nonatomic, strong) HostCollectionViewController *hostCollectionVC; @property (nonatomic, strong) HostCollectionViewController *hostCollectionVC;
@property (weak, nonatomic) IBOutlet UINavigationItem *navigationItem; @property (weak, nonatomic) IBOutlet UINavigationItem *navigationItem;
VoidLink/ViewControllers/StreamFrameViewController.m
+8 -9
View File
@@ -180,7 +180,7 @@
- (bool)isOnScreenWidgetEnabled{ - (bool)isOnScreenWidgetEnabled{
return (_settings.touchMode.intValue == RelativeTouch || _settings.touchMode.intValue == NativeTouch || _settings.touchMode.intValue == AbsoluteTouch || _settings.touchMode.intValue == TouchDisabled) && _settings.onscreenControls.intValue == OnScreenControlsLevelCustom; return (_oscProfile.touchMode == RelativeTouch || _oscProfile.touchMode == NativeTouch || _oscProfile.touchMode == AbsoluteTouch || _oscProfile.touchMode == TouchDisabled) && _settings.onscreenControls.intValue == OnScreenControlsLevelCustom;
} }
- (void)setupPiPControllerWithRenderer:(VideoDecoderRenderer *)videoRenderer { // Ensure we have the renderer and its layer - (void)setupPiPControllerWithRenderer:(VideoDecoderRenderer *)videoRenderer { // Ensure we have the renderer and its layer
@@ -300,6 +300,7 @@
_slideToToolboxRecognizer.delaysTouchesEnded = NO; _slideToToolboxRecognizer.delaysTouchesEnded = NO;
[self.view addGestureRecognizer:_slideToToolboxRecognizer]; [self.view addGestureRecognizer:_slideToToolboxRecognizer];
/*
if([self isOnScreenWidgetEnabled]){ if([self isOnScreenWidgetEnabled]){
_oscLayoutTapRecoginizer = [[CustomTapGestureRecognizer alloc] initWithTarget:self action:@selector(handleWidgetLayoutGesture)]; _oscLayoutTapRecoginizer = [[CustomTapGestureRecognizer alloc] initWithTarget:self action:@selector(handleWidgetLayoutGesture)];
_oscLayoutTapRecoginizer.numberOfTouchesRequired = _settings.oscLayoutToolFingers.intValue; //tap a predefined number of fingers to open osc layout tool _oscLayoutTapRecoginizer.numberOfTouchesRequired = _settings.oscLayoutToolFingers.intValue; //tap a predefined number of fingers to open osc layout tool
@@ -310,7 +311,7 @@
[self.view addGestureRecognizer:_oscLayoutTapRecoginizer]; [self.view addGestureRecognizer:_oscLayoutTapRecoginizer];
_oscLayoutTapRecoginizer.touchCapturingView = _streamView; _oscLayoutTapRecoginizer.touchCapturingView = _streamView;
} }
*/
} }
- (BOOL)currentProfileContainsMagnifierWidget { - (BOOL)currentProfileContainsMagnifierWidget {
@@ -446,7 +447,7 @@
- (void)handleScrollPan:(UIPanGestureRecognizer *)gesture { - (void)handleScrollPan:(UIPanGestureRecognizer *)gesture {
switch (gesture.state){ switch (gesture.state){
case UIGestureRecognizerStateEnded: case UIGestureRecognizerStateEnded:
if(_settings.touchMode.intValue == AbsoluteTouch && _scrollView.zoomScale < 1.0) [self resetMagnifierStreamViewWithAnimated:true]; if(_oscProfile.touchMode == AbsoluteTouch && _scrollView.zoomScale < 1.0) [self resetMagnifierStreamViewWithAnimated:true];
break; break;
default: default:
break; break;
@@ -626,7 +627,7 @@
TouchPadGestureHandler.pinchSensitivity = _settings.pinchSensitivity.floatValue; TouchPadGestureHandler.pinchSensitivity = _settings.pinchSensitivity.floatValue;
TouchPadGestureHandler.displayLinkRate = _settings.framerate.intValue; TouchPadGestureHandler.displayLinkRate = _settings.framerate.intValue;
[self setMagnifierViewportInteractionEnabled:_settings.touchMode.intValue == AbsoluteTouch && !_settings.passthroughGestures]; [self setMagnifierViewportInteractionEnabled:_oscProfile.touchMode == AbsoluteTouch && !_settings.passthroughGestures];
GenericUtils.globeAsEscape = _settings.globeAsEscape; GenericUtils.globeAsEscape = _settings.globeAsEscape;
@@ -964,9 +965,7 @@
[self.view insertSubview:self.metalViewController.view atIndex:0]; [self.view insertSubview:self.metalViewController.view atIndex:0];
[self.metalViewController didMoveToParentViewController:self]; [self.metalViewController didMoveToParentViewController:self];
} }
_mainFrameViewcontroller.sessionLaunchedWithAbsoluteTouch = _settings.touchMode.intValue == AbsoluteTouch;
OnScreenWidgetView.gamepadArrivalReported = false; OnScreenWidgetView.gamepadArrivalReported = false;
OnScreenWidgetView.enableFolderAnimation = false; OnScreenWidgetView.enableFolderAnimation = false;
@@ -1048,7 +1047,7 @@
} }
- (void)setMagnifierViewportInteractionEnabled:(BOOL)enabled { - (void)setMagnifierViewportInteractionEnabled:(BOOL)enabled {
_magnifierViewportInteractionActive = enabled || _settings.touchMode.intValue == AbsoluteTouch; _magnifierViewportInteractionActive = enabled || (_oscProfile.touchMode == AbsoluteTouch && !_settings.passthroughGestures);
[self updateScrollViewInteractionState]; [self updateScrollViewInteractionState];
} }
@@ -1064,7 +1063,7 @@
[self setMagnifierViewportInteractionEnabled:true]; [self setMagnifierViewportInteractionEnabled:true];
CGPoint streamViewOffset = CGPointMake(profile.normalizedStreamViewOffset.x*self.view.bounds.size.width, profile.normalizedStreamViewOffset.y*self.view.bounds.size.height); CGPoint streamViewOffset = CGPointMake(profile.normalizedStreamViewOffset.x*self.view.bounds.size.width, profile.normalizedStreamViewOffset.y*self.view.bounds.size.height);
[self restoreMagnifierStreamViewWithOffset:streamViewOffset scale:profile.streamViewScale animated:YES]; [self restoreMagnifierStreamViewWithOffset:streamViewOffset scale:profile.streamViewScale animated:YES];
[self setMagnifierViewportInteractionEnabled:_settings.touchMode.intValue == AbsoluteTouch && !_settings.passthroughGestures]; [self setMagnifierViewportInteractionEnabled:profile.touchMode == AbsoluteTouch && !_settings.passthroughGestures];
} }
- (void)restoreMagnifierStreamViewWithOffset:(CGPoint)offset scale:(CGFloat)scale { - (void)restoreMagnifierStreamViewWithOffset:(CGPoint)offset scale:(CGFloat)scale {