cancel auto osc mode

This commit is contained in:
True Zhuanjia committed 2024-07-11 01:14:24 +08:00
1 parent 6c4b5321e1
commit 84bffdd287
6 files changed
+73 -73

No files matched your search

-1
View File
@@ -212,7 +212,6 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="Off"/>
<segment title="Auto"/>
<segment title="Simple"/>
<segment title="Full"/>
<segment title="Custom"/>
-1
View File
@@ -230,7 +230,6 @@ ICAgICAgICAgICAgIA
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<segments>
<segment title="Off"/>
<segment title="Auto"/>
<segment title="Simple"/>
<segment title="Full"/>
<segment title="Custom"/>
+2 -2
View File
@@ -20,11 +20,11 @@ static const float BUTTON_DIST = 20;
typedef NS_ENUM(NSInteger, OnScreenControlsLevel) {
OnScreenControlsLevelOff,
OnScreenControlsLevelAuto,
OnScreenControlsLevelSimple,
OnScreenControlsLevelFull,
OnScreenControlsLevelCustom,
OnScreenControlsLevelAuto, // move it here instead of delete , to ensure integrity of the codes
// Internal levels selected by ControllerSupport
OnScreenControlsLevelAutoGCGamepad,
OnScreenControlsLevelAutoGCExtendedGamepad,
+3 -1
View File
@@ -106,6 +106,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
case REGULAR_NATIVE_TOUCH:
keyboardToggleRecognizer.immediateTriggering = false;
if(settings.onscreenControls.intValue == OnScreenControlsLevelCustom) keyboardToggleRecognizer.numberOfTouchesRequired = 3; //fixing keyboard taps to 3, in order to invoke OSC rebase in stream view by 4-finger tap.
case PURE_NATIVE_TOUCH:
self->touchHandler = [[NativeTouchHandler alloc] initWithView:self andSettings:settings];break;
case RELATIVE_TOUCH:
@@ -128,7 +129,8 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
Log(LOG_I, @"On-screen controls disabled in non-relative touch mode");
[onScreenControls setLevel:OnScreenControlsLevelOff];
}
else if (level == OnScreenControlsLevelAuto) {
//else if (level == OnScreenControlsLevelAuto) {
else if (false) { // level auto cancelled in settings
[controllerSupport initAutoOnScreenControlMode:onScreenControls];
}
else {
+34 -34
View File
@@ -1628,37 +1628,7 @@
}
},
"qSU-wh-tqA.segmentTitles[1]" : {
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[1] = \"Auto\"; ObjectID = \"qSU-wh-tqA\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Auto"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "自动"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "自动"
}
},
"zh-HK" : {
"stringUnit" : {
"state" : "translated",
"value" : "自动"
}
}
}
},
"qSU-wh-tqA.segmentTitles[2]" : {
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[2] = \"Simple\"; ObjectID = \"qSU-wh-tqA\";",
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[1] = \"Simple\"; ObjectID = \"qSU-wh-tqA\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
@@ -1687,8 +1657,8 @@
}
}
},
"qSU-wh-tqA.segmentTitles[3]" : {
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[3] = \"Full\"; ObjectID = \"qSU-wh-tqA\";",
"qSU-wh-tqA.segmentTitles[2]" : {
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[2] = \"Full\"; ObjectID = \"qSU-wh-tqA\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
@@ -1717,9 +1687,39 @@
}
}
},
"qSU-wh-tqA.segmentTitles[3]" : {
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[3] = \"Custom\"; ObjectID = \"qSU-wh-tqA\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Custom"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "自定义"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "自定义"
}
},
"zh-HK" : {
"stringUnit" : {
"state" : "translated",
"value" : "自定义"
}
}
}
},
"qSU-wh-tqA.segmentTitles[4]" : {
"comment" : "Class = \"UISegmentedControl\"; qSU-wh-tqA.segmentTitles[4] = \"Custom\"; ObjectID = \"qSU-wh-tqA\";",
"extractionState" : "extracted_with_value",
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {
+34 -34
View File
@@ -1730,37 +1730,7 @@
}
},
"WGf-9d-eAm.segmentTitles[1]" : {
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[1] = \"Auto\"; ObjectID = \"WGf-9d-eAm\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Auto"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "自动"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "自动"
}
},
"zh-HK" : {
"stringUnit" : {
"state" : "translated",
"value" : "自动"
}
}
}
},
"WGf-9d-eAm.segmentTitles[2]" : {
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[2] = \"Simple\"; ObjectID = \"WGf-9d-eAm\";",
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[1] = \"Simple\"; ObjectID = \"WGf-9d-eAm\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
@@ -1789,8 +1759,8 @@
}
}
},
"WGf-9d-eAm.segmentTitles[3]" : {
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[3] = \"Full\"; ObjectID = \"WGf-9d-eAm\";",
"WGf-9d-eAm.segmentTitles[2]" : {
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[2] = \"Full\"; ObjectID = \"WGf-9d-eAm\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
@@ -1819,9 +1789,39 @@
}
}
},
"WGf-9d-eAm.segmentTitles[3]" : {
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[3] = \"Custom\"; ObjectID = \"WGf-9d-eAm\";",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Custom"
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "自定义"
}
},
"zh-Hant" : {
"stringUnit" : {
"state" : "translated",
"value" : "自定义"
}
},
"zh-HK" : {
"stringUnit" : {
"state" : "translated",
"value" : "自定义"
}
}
}
},
"WGf-9d-eAm.segmentTitles[4]" : {
"comment" : "Class = \"UISegmentedControl\"; WGf-9d-eAm.segmentTitles[4] = \"Custom\"; ObjectID = \"WGf-9d-eAm\";",
"extractionState" : "extracted_with_value",
"extractionState" : "stale",
"localizations" : {
"en" : {
"stringUnit" : {