touchmode indicator for exprerimental section
This commit is contained in:
@@ -260,6 +260,29 @@
|
||||
<constraint firstAttribute="width" constant="380" id="Yf1-gv-h0d"/>
|
||||
</constraints>
|
||||
</stackView>
|
||||
<stackView verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="MFl-tk-Uji" userLabel="touchModeStack2">
|
||||
<rect key="frame" x="892" y="2453" width="380" height="31"/>
|
||||
<subviews>
|
||||
<segmentedControl verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" apportionsSegmentWidthsByContent="YES" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="Bkf-0d-XuA" userLabel="Touch Mode Selector">
|
||||
<rect key="frame" x="0.0" y="0.0" width="380" height="32"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="31" id="eWH-O2-p59"/>
|
||||
</constraints>
|
||||
<segments>
|
||||
<segment title="Touchpad"/>
|
||||
<segment title="Native Touch"/>
|
||||
<segment title="Single Point"/>
|
||||
<segment title="Disabled"/>
|
||||
</segments>
|
||||
<color key="tintColor" systemColor="systemBrownColor"/>
|
||||
<color key="selectedSegmentTintColor" systemColor="linkColor"/>
|
||||
</segmentedControl>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="380" id="7Uw-kJ-bBA"/>
|
||||
<constraint firstAttribute="height" constant="31" id="syI-vD-Jbk"/>
|
||||
</constraints>
|
||||
</stackView>
|
||||
<stackView verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="YBu-VX-wpN" userLabel="externalDisplayMode Stack">
|
||||
<rect key="frame" x="20" y="2497" width="380" height="56.5"/>
|
||||
<subviews>
|
||||
@@ -1380,16 +1403,16 @@
|
||||
</constraints>
|
||||
</stackView>
|
||||
<stackView verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Oyk-L5-WTt" userLabel="singleTapSensitivityStack">
|
||||
<rect key="frame" x="440" y="307" width="792" height="55.5"/>
|
||||
<rect key="frame" x="440" y="307" width="824" height="55.5"/>
|
||||
<subviews>
|
||||
<label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Single Tap Sensitivity" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SuN-S2-8hj">
|
||||
<rect key="frame" x="0.0" y="0.0" width="792" height="20.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="824" height="20.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<slider verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="2" minValue="0.0" maxValue="5" minimumValueImage="0.square" catalog="system" maximumValueImage="5.square" translatesAutoresizingMaskIntoConstraints="NO" id="j4n-De-TRX" userLabel="Single Tap Sensitivity Slider">
|
||||
<rect key="frame" x="-2" y="25.5" width="796" height="31"/>
|
||||
<rect key="frame" x="-2" y="25.5" width="828" height="31"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="30" id="qOF-42-hPO"/>
|
||||
</constraints>
|
||||
@@ -1747,7 +1770,9 @@
|
||||
<outlet property="testStack" destination="aP7-M9-psT" id="xAv-s6-rea"/>
|
||||
<outlet property="touchModeLabel" destination="MUY-2Y-bHi" id="6jD-aq-rmE"/>
|
||||
<outlet property="touchModeSelector" destination="bhC-da-VGd" id="hna-Cr-kyd"/>
|
||||
<outlet property="touchModeSelector2" destination="Bkf-0d-XuA" id="iY6-nI-QrW"/>
|
||||
<outlet property="touchModeStack" destination="M78-Pw-jWx" id="mdl-y3-54B"/>
|
||||
<outlet property="touchModeStack2" destination="MFl-tk-Uji" id="3ev-wc-kGK"/>
|
||||
<outlet property="touchMoveEventIntervalLabel" destination="FJv-HJ-UYJ" id="evb-ZA-S53"/>
|
||||
<outlet property="touchMoveEventIntervalSlider" destination="4gD-tc-95I" id="h7Y-LN-LPg"/>
|
||||
<outlet property="touchMoveEventIntervalStack" destination="iYl-5Z-ujb" id="aWe-Fq-7ei"/>
|
||||
|
||||
@@ -2284,16 +2284,16 @@
|
||||
</constraints>
|
||||
</stackView>
|
||||
<stackView verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="N0i-z6-WgC" userLabel="singleTapSensitivityStack">
|
||||
<rect key="frame" x="437" y="2383" width="532" height="55.5"/>
|
||||
<rect key="frame" x="437" y="2383" width="540" height="55.5"/>
|
||||
<subviews>
|
||||
<label verifyAmbiguity="off" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Single Tap Sensitivity" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WzD-wo-Wum">
|
||||
<rect key="frame" x="0.0" y="0.0" width="532" height="20.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="540" height="20.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<slider verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="2" minValue="0.0" maxValue="5" minimumValueImage="0.square" catalog="system" maximumValueImage="5.square" translatesAutoresizingMaskIntoConstraints="NO" id="uCa-Oa-7mv" userLabel="Single Tap Sensitivity Slider">
|
||||
<rect key="frame" x="-2" y="25.5" width="536" height="31"/>
|
||||
<rect key="frame" x="-2" y="25.5" width="544" height="31"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="30" id="XXP-GP-uhn"/>
|
||||
</constraints>
|
||||
@@ -2447,6 +2447,29 @@
|
||||
<constraint firstAttribute="height" constant="55.5" id="t55-ec-BBv"/>
|
||||
</constraints>
|
||||
</stackView>
|
||||
<stackView verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" ambiguous="YES" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="cNd-hI-JAS" userLabel="touchModeStack2">
|
||||
<rect key="frame" x="437" y="2604" width="380" height="31"/>
|
||||
<subviews>
|
||||
<segmentedControl verifyAmbiguity="off" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" apportionsSegmentWidthsByContent="YES" segmentControlStyle="plain" selectedSegmentIndex="1" translatesAutoresizingMaskIntoConstraints="NO" id="n8C-pt-nPE" userLabel="Touch Mode Selector">
|
||||
<rect key="frame" x="0.0" y="0.0" width="380" height="32"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="31" id="5QE-p2-z4w"/>
|
||||
</constraints>
|
||||
<segments>
|
||||
<segment title="Touchpad"/>
|
||||
<segment title="Native Touch"/>
|
||||
<segment title="Single Point"/>
|
||||
<segment title="Disabled"/>
|
||||
</segments>
|
||||
<color key="tintColor" systemColor="systemBrownColor"/>
|
||||
<color key="selectedSegmentTintColor" systemColor="linkColor"/>
|
||||
</segmentedControl>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="380" id="70h-Lh-vfU"/>
|
||||
<constraint firstAttribute="height" constant="31" id="T1t-8e-I8X"/>
|
||||
</constraints>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
@@ -2579,7 +2602,9 @@
|
||||
<outlet property="swapAbxySwitch" destination="T5q-1k-zB3" id="153-6O-0Pv"/>
|
||||
<outlet property="touchModeLabel" destination="v5B-5J-veL" id="ewI-fd-FnI"/>
|
||||
<outlet property="touchModeSelector" destination="A9r-dE-rT4" id="DBR-8D-QTL"/>
|
||||
<outlet property="touchModeSelector2" destination="n8C-pt-nPE" id="N2Y-O4-zK6"/>
|
||||
<outlet property="touchModeStack" destination="2bi-tR-7sa" id="Fh0-Q4-fiq"/>
|
||||
<outlet property="touchModeStack2" destination="cNd-hI-JAS" id="tOg-4I-grM"/>
|
||||
<outlet property="touchMoveEventIntervalLabel" destination="XtQ-YN-4jb" id="0v4-XL-Hrm"/>
|
||||
<outlet property="touchMoveEventIntervalSlider" destination="Qqh-Oh-dOV" id="NAo-ue-Wcj"/>
|
||||
<outlet property="touchMoveEventIntervalStack" destination="zxb-vp-LNg" id="Nem-Bf-isy"/>
|
||||
|
||||
@@ -202,6 +202,10 @@
|
||||
@property (strong, nonatomic) IBOutlet UIStackView *pinchSensitivityStack;
|
||||
@property (strong, nonatomic) IBOutlet UISlider *pinchSensitivitySlider;
|
||||
|
||||
@property (strong, nonatomic) IBOutlet UIStackView *touchModeStack2;
|
||||
@property (strong, nonatomic) IBOutlet UISegmentedControl *touchModeSelector2;
|
||||
|
||||
|
||||
@property (strong, nonatomic) IBOutlet UIStackView *testStack;
|
||||
|
||||
@property (nonatomic, strong) MicHandler *micHandler;
|
||||
|
||||
@@ -830,7 +830,9 @@ BOOL isCustomResolution(int resolutionSelected) {
|
||||
if (@available(iOS 13.0, *)) {
|
||||
[experimentalSection setSectionWithIcon:[UIImage imageNamed:@"flask"] andSize:20];
|
||||
}
|
||||
// [self addSetting:self.touchModeStack ofId:@"touchModeStack" withInfoTag:NO withDynamicLabel:NO to:experimentalSection];
|
||||
|
||||
[self addSetting:self.touchModeStack2 ofId:@"touchModeStack2" withInfoTag:NO withDynamicLabel:NO to:experimentalSection];
|
||||
[self.touchModeSelector2 setEnabled:false];
|
||||
[self addSetting:self.touchMoveEventIntervalStack ofId:@"touchMoveEventIntervalStack" withInfoTag:NO withDynamicLabel:YES to:experimentalSection];
|
||||
[self addSetting:self.relativeTouchSlideThresholdStack ofId:@"relativeTouchSlideThresholdStack" withInfoTag:YES withDynamicLabel:YES to:experimentalSection];
|
||||
[self addSetting:self.singleTapSensitivityStack ofId:@"singleTapSensitivityStack" withInfoTag:NO withDynamicLabel:YES to:experimentalSection];
|
||||
@@ -2358,6 +2360,7 @@ BOOL isCustomResolution(int resolutionSelected) {
|
||||
- (void)touchModeChanged:(UISegmentedControl* )sender {
|
||||
// Disable On-Screen Controls & Widgets in non-relative touch mode
|
||||
// bool customOscEnabled = [self isOswEnabled] && [self.onScreenWidgetSelector selectedSegmentIndex] == OnScreenControlsLevelCustom;
|
||||
self.touchModeSelector2.selectedSegmentIndex = sender.selectedSegmentIndex;
|
||||
bool isNativeTouch = sender.selectedSegmentIndex == NativeTouch;
|
||||
//bool asyncNativeTouchEnabled = [self.asyncNativeTouchPrioritySelector selectedSegmentIndex] != AsyncNativeTouchOff;
|
||||
if(self.enableOswSwitchStack.hidden != !isNativeTouch && isNativeTouch) [self highlightEmergingStack:self.enableOswSwitchStack];
|
||||
|
||||
@@ -1327,6 +1327,126 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"Bkf-0d-XuA.segmentTitles[0]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; Bkf-0d-XuA.segmentTitles[0] = \"Touchpad\"; ObjectID = \"Bkf-0d-XuA\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Touchpad"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "触控板"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "觸控板"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "觸控板"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Bkf-0d-XuA.segmentTitles[1]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; Bkf-0d-XuA.segmentTitles[1] = \"Native Touch\"; ObjectID = \"Bkf-0d-XuA\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Native Touch"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "多点触控"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "多點觸控"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "多點觸控"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Bkf-0d-XuA.segmentTitles[2]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; Bkf-0d-XuA.segmentTitles[2] = \"Single Point\"; ObjectID = \"Bkf-0d-XuA\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Single Point"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "单点鼠标"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "單點滑鼠"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "單點滑鼠"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"Bkf-0d-XuA.segmentTitles[3]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; Bkf-0d-XuA.segmentTitles[3] = \"Disabled\"; ObjectID = \"Bkf-0d-XuA\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Disabled"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "关闭"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "關閉"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "關閉"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"c1r-Hf-b7t.text" : {
|
||||
"comment" : "Class = \"UILabel\"; text = \"Down button\"; ObjectID = \"c1r-Hf-b7t\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
|
||||
@@ -2779,6 +2779,126 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"n8C-pt-nPE.segmentTitles[0]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; n8C-pt-nPE.segmentTitles[0] = \"Touchpad\"; ObjectID = \"n8C-pt-nPE\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Touchpad"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "触控板"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "觸控板"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "觸控板"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"n8C-pt-nPE.segmentTitles[1]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; n8C-pt-nPE.segmentTitles[1] = \"Native Touch\"; ObjectID = \"n8C-pt-nPE\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Native Touch"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "多点触控"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "多點觸控"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "多點觸控"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"n8C-pt-nPE.segmentTitles[2]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; n8C-pt-nPE.segmentTitles[2] = \"Single Point\"; ObjectID = \"n8C-pt-nPE\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Single Point"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "单点鼠标"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "單點滑鼠"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "單點滑鼠"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"n8C-pt-nPE.segmentTitles[3]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; n8C-pt-nPE.segmentTitles[3] = \"Disabled\"; ObjectID = \"n8C-pt-nPE\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "new",
|
||||
"value" : "Disabled"
|
||||
}
|
||||
},
|
||||
"zh-Hans" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "关闭"
|
||||
}
|
||||
},
|
||||
"zh-Hant" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "關閉"
|
||||
}
|
||||
},
|
||||
"zh-HK" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "關閉"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"nj6-9l-1j7.segmentTitles[0]" : {
|
||||
"comment" : "Class = \"UISegmentedControl\"; nj6-9l-1j7.segmentTitles[0] = \"Auto\"; ObjectID = \"nj6-9l-1j7\";",
|
||||
"extractionState" : "extracted_with_value",
|
||||
|
||||
Reference in New Issue
Block a user