- feat: mouseWheel on-screen widget
This commit is contained in:
1 parent
c3b7679268
commit
5418936816
4 files changed
+18
-4
No files matched your search
@@ -115,7 +115,7 @@ import UIKit
|
|||||||
"OSCBACK"
|
"OSCBACK"
|
||||||
]
|
]
|
||||||
|
|
||||||
@objc public static let touchPadCmds: [String] = ["LSVPAD", "RSVPAD", "LSPAD", "RSPAD", "DS4TOUCH", "MOUSEPAD", "DPAD", "TRACKBALL", "WASDPAD", "ARROWPAD"]
|
@objc public static let touchPadCmds: [String] = ["LSVPAD", "RSVPAD", "LSPAD", "RSPAD", "DS4TOUCH", "MOUSEPAD", "MOUSEWHEEL", "WHEEL", "DPAD", "TRACKBALL", "WASDPAD", "ARROWPAD"]
|
||||||
@objc public static let directionPads: [String] = ["DPAD", "WASDPAD", "ARROWPAD"]
|
@objc public static let directionPads: [String] = ["DPAD", "WASDPAD", "ARROWPAD"]
|
||||||
@objc public static let stickTouchPads: [String] = ["LSVPAD", "RSVPAD", "LSPAD", "RSPAD"]
|
@objc public static let stickTouchPads: [String] = ["LSVPAD", "RSVPAD", "LSPAD", "RSPAD"]
|
||||||
@objc public static let nonVectorStickPads: [String] = ["LSPAD", "RSPAD"]
|
@objc public static let nonVectorStickPads: [String] = ["LSPAD", "RSPAD"]
|
||||||
|
|||||||
@@ -1238,7 +1238,7 @@ import UIKit
|
|||||||
if quickDoubleTapDetected {
|
if quickDoubleTapDetected {
|
||||||
self.showl3r3Indicator()
|
self.showl3r3Indicator()
|
||||||
self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)}
|
self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)}
|
||||||
case "DPAD", "WASDPAD", "ARROWPAD":
|
case "DPAD", "WASDPAD", "ARROWPAD", "MOUSEWHEEL", "WHEEL":
|
||||||
if allSpawnedTouchesCount == 1 {showLrudBall(at: touchBeganLocation)}
|
if allSpawnedTouchesCount == 1 {showLrudBall(at: touchBeganLocation)}
|
||||||
if quickDoubleTapDetected {
|
if quickDoubleTapDetected {
|
||||||
self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)
|
self.sendComboButtonsDownEvent(comboStrings: self.comboButtonStrings)
|
||||||
@@ -1508,6 +1508,9 @@ import UIKit
|
|||||||
case "DPAD", "WASDPAD", "ARROWPAD":
|
case "DPAD", "WASDPAD", "ARROWPAD":
|
||||||
self.updateTouchLocation(touch: touches.first!)
|
self.updateTouchLocation(touch: touches.first!)
|
||||||
handleLrudTouchMove()
|
handleLrudTouchMove()
|
||||||
|
case "MOUSEWHEEL","WHEEL":
|
||||||
|
self.updateTouchLocation(touch: touches.first!)
|
||||||
|
LiSendHighResScrollEvent(Int16(self.deltaY*7.5*self.sensitivityFactorY))
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-1
@@ -763,7 +763,19 @@
|
|||||||
bool showSensitivityFactorStack = selectedWidgetView.hasSensitivityTweak;
|
bool showSensitivityFactorStack = selectedWidgetView.hasSensitivityTweak;
|
||||||
bool showStickIndicatorOffsetStack = selectedWidgetView.hasStickIndicator;
|
bool showStickIndicatorOffsetStack = selectedWidgetView.hasStickIndicator;
|
||||||
|
|
||||||
self.sensitivityXStack.hidden = self.sensitivityYStack.hidden = !showSensitivityFactorStack;
|
self.sensitivityXStack.hidden = !showSensitivityFactorStack || [selectedWidgetView.cmdString containsString:@"MOUSEWHEEL"] || [selectedWidgetView.cmdString containsString:@"WHEEL"];
|
||||||
|
self.sensitivityYStack.hidden = !showSensitivityFactorStack;
|
||||||
|
if(showSensitivityFactorStack){
|
||||||
|
if([selectedWidgetView.cmdString containsString:@"MOUSEWHEEL"] || [selectedWidgetView.cmdString containsString:@"WHEEL"]){
|
||||||
|
[self.sensitivityYSlider setMinimumValue:-4];
|
||||||
|
[self.sensitivityYSlider setMaximumValue:4];
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
[self.sensitivityYSlider setMinimumValue:0];
|
||||||
|
[self.sensitivityYSlider setMaximumValue:8];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
self.stickIndicatorOffsetStack.hidden = !showStickIndicatorOffsetStack;
|
self.stickIndicatorOffsetStack.hidden = !showStickIndicatorOffsetStack;
|
||||||
self.mouseDownButtonStack.hidden = !([selectedWidgetView.cmdString containsString:@"MOUSEPAD"] && selectedWidgetView.widgetType == WidgetTypeEnumTouchPad);
|
self.mouseDownButtonStack.hidden = !([selectedWidgetView.cmdString containsString:@"MOUSEPAD"] && selectedWidgetView.widgetType == WidgetTypeEnumTouchPad);
|
||||||
self.decelerationRateStack.hidden = !([selectedWidgetView.cmdString containsString:@"TRACKBALL"] && selectedWidgetView.widgetType == WidgetTypeEnumTouchPad);
|
self.decelerationRateStack.hidden = !([selectedWidgetView.cmdString containsString:@"TRACKBALL"] && selectedWidgetView.widgetType == WidgetTypeEnumTouchPad);
|
||||||
|
|||||||
@@ -602,7 +602,6 @@ BOOL isCustomResolution(int resolutionSelected) {
|
|||||||
[self addSetting:self.hdrStack ofId:@"hdrStack" withInfoTag:![self hdrSupported] withDynamicLabel:NO to:videoSection];
|
[self addSetting:self.hdrStack ofId:@"hdrStack" withInfoTag:![self hdrSupported] withDynamicLabel:NO to:videoSection];
|
||||||
[self addSetting:self.yuv444Stack ofId:@"yuv444Stack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
[self addSetting:self.yuv444Stack ofId:@"yuv444Stack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
||||||
[self addSetting:self.pipStack ofId:@"pipStack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
[self addSetting:self.pipStack ofId:@"pipStack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
||||||
[self addSetting:self.pipStack ofId:@"pipStack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
|
||||||
[self addSetting:self.framePacingStack ofId:@"framePacingStack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
[self addSetting:self.framePacingStack ofId:@"framePacingStack" withInfoTag:YES withDynamicLabel:NO to:videoSection];
|
||||||
[self addSetting:self.frameQueueSizeStack ofId:@"frameQueueSizeStack" withInfoTag:NO withDynamicLabel:YES to:videoSection];
|
[self addSetting:self.frameQueueSizeStack ofId:@"frameQueueSizeStack" withInfoTag:NO withDynamicLabel:YES to:videoSection];
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user