functional button rule update
This commit is contained in:
1 parent
02926b2c6b
commit
6008865a41
2 files changed
+6
-1
No files matched your search
@@ -158,6 +158,7 @@ import SVGKit
|
|||||||
@objc public var isMousePadWithButtonActions: Bool = false
|
@objc public var isMousePadWithButtonActions: Bool = false
|
||||||
@objc public var hasInertia: Bool = false
|
@objc public var hasInertia: Bool = false
|
||||||
@objc public var isFunctionalButton: Bool = false
|
@objc public var isFunctionalButton: Bool = false
|
||||||
|
@objc public var isTapToToggleException: Bool = false
|
||||||
@objc public var hasHapticFeedback: Bool = false
|
@objc public var hasHapticFeedback: Bool = false
|
||||||
@objc public var isDirectionPad: Bool = false
|
@objc public var isDirectionPad: Bool = false
|
||||||
@objc public var hasL3R3Indicator: Bool = false
|
@objc public var hasL3R3Indicator: Bool = false
|
||||||
@@ -462,6 +463,10 @@ import SVGKit
|
|||||||
self.isMousePadWithButtonActions = CommandManager.mousePadWithButtonActions.contains(self.touchPadString) && widgetType == WidgetTypeEnum.touchPad
|
self.isMousePadWithButtonActions = CommandManager.mousePadWithButtonActions.contains(self.touchPadString) && widgetType == WidgetTypeEnum.touchPad
|
||||||
self.hasInertia = CommandManager.inertialTouchPads.contains(self.touchPadString)
|
self.hasInertia = CommandManager.inertialTouchPads.contains(self.touchPadString)
|
||||||
self.isFunctionalButton = self.functionalButtonString != "" || self.cmdString.contains("+")
|
self.isFunctionalButton = self.functionalButtonString != "" || self.cmdString.contains("+")
|
||||||
|
self.isTapToToggleException = (self.functionalButtonString == "NOSINGLETOUCH"
|
||||||
|
|| self.functionalButtonString == "PENCILHOVER"
|
||||||
|
|| self.functionalButtonString == "ABSTCHDRAG"
|
||||||
|
)
|
||||||
self.hasHapticFeedback = !self.comboButtonStrings.isEmpty || CommandManager.directionPads.contains(self.touchPadString)
|
self.hasHapticFeedback = !self.comboButtonStrings.isEmpty || CommandManager.directionPads.contains(self.touchPadString)
|
||||||
self.isDirectionPad = self.widgetType == WidgetTypeEnum.touchPad && CommandManager.directionPads.contains(self.touchPadString)
|
self.isDirectionPad = self.widgetType == WidgetTypeEnum.touchPad && CommandManager.directionPads.contains(self.touchPadString)
|
||||||
self.isStickWheel = self.widgetType == WidgetTypeEnum.touchPad && CommandManager.stickWheels.contains(self.touchPadString)
|
self.isStickWheel = self.widgetType == WidgetTypeEnum.touchPad && CommandManager.stickWheels.contains(self.touchPadString)
|
||||||
|
|||||||
+1
-1
@@ -1119,7 +1119,7 @@ typedef NS_ENUM(NSUInteger, DecelerationRateSliderMode) {
|
|||||||
[self.buttonModeSelector setEnabled:slideAndHoldEnabled forSegmentAtIndex:slideAndHold];
|
[self.buttonModeSelector setEnabled:slideAndHoldEnabled forSegmentAtIndex:slideAndHold];
|
||||||
[self.buttonModeSelector setEnabled:!selectedWidgetView.isFolder forSegmentAtIndex:regular];
|
[self.buttonModeSelector setEnabled:!selectedWidgetView.isFolder forSegmentAtIndex:regular];
|
||||||
[self.buttonModeSelector setEnabled:!selectedWidgetView.isFunctionalButton
|
[self.buttonModeSelector setEnabled:!selectedWidgetView.isFunctionalButton
|
||||||
|| [selectedWidgetView.functionalButtonString containsString:@"ABSTCHDRAG"]
|
|| selectedWidgetView.isTapToToggleException
|
||||||
forSegmentAtIndex:tapToToggle];
|
forSegmentAtIndex:tapToToggle];
|
||||||
[self.buttonModeSelector setSelectedSegmentIndex:selectedWidgetView.buttonMode];
|
[self.buttonModeSelector setSelectedSegmentIndex:selectedWidgetView.buttonMode];
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user