- update widget tempates
- minor fixes
This commit is contained in:
1 parent
9359333b15
commit
780a0e7ab8
8 files changed
+66
-6
No files matched your search
@@ -280,7 +280,7 @@ static CGRect layoutViewBounds;
|
|||||||
|
|
||||||
// NSString* persistedKey = @"widgetProfileUpdated-20251015";
|
// NSString* persistedKey = @"widgetProfileUpdated-20251015";
|
||||||
// NSString* persistedKey = @"widgetProfileUpdated-20260322";
|
// NSString* persistedKey = @"widgetProfileUpdated-20260322";
|
||||||
NSString* persistedKey = @"widgetProfileUpdated-20260408";
|
NSString* persistedKey = @"widgetProfileUpdated-20260413";
|
||||||
BOOL needImportDefaultTemplates = [defaults objectForKey:persistedKey] == nil;
|
BOOL needImportDefaultTemplates = [defaults objectForKey:persistedKey] == nil;
|
||||||
|
|
||||||
if(profiles.count == 0 || needImportDefaultTemplates){
|
if(profiles.count == 0 || needImportDefaultTemplates){
|
||||||
|
|||||||
@@ -72,6 +72,7 @@
|
|||||||
- (void)readyToBringUpSoftKeyboardByToolbox;
|
- (void)readyToBringUpSoftKeyboardByToolbox;
|
||||||
- (void)keyboardWillShow:(NSNotification *)notification;
|
- (void)keyboardWillShow:(NSNotification *)notification;
|
||||||
- (void)keyboardWillHide;
|
- (void)keyboardWillHide;
|
||||||
|
- (void)handleAbnormalKeyboards:(NSNotification *)notification;
|
||||||
- (void)liftMetalVideoViewIfNeeded:(CGFloat)liftHeight;
|
- (void)liftMetalVideoViewIfNeeded:(CGFloat)liftHeight;
|
||||||
|
|
||||||
- (void)alterAbsTouchDragWith:(int32_t)mouseButton;
|
- (void)alterAbsTouchDragWith:(int32_t)mouseButton;
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
|||||||
|
|
||||||
KeyboardInputField* keyInputField;
|
KeyboardInputField* keyInputField;
|
||||||
BOOL isInputingText;
|
BOOL isInputingText;
|
||||||
|
bool dockedKeyboardActionDetected;
|
||||||
|
|
||||||
bool isPencilHovering;
|
bool isPencilHovering;
|
||||||
NSMutableSet* keysDown;
|
NSMutableSet* keysDown;
|
||||||
float streamAspectRatio;
|
float streamAspectRatio;
|
||||||
@@ -257,6 +259,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
|||||||
|
|
||||||
- (void)keyboardWillShow:(NSNotification *)notification{
|
- (void)keyboardWillShow:(NSNotification *)notification{
|
||||||
// NSLog(@"keyboard will show markmark %f", CACurrentMediaTime());
|
// NSLog(@"keyboard will show markmark %f", CACurrentMediaTime());
|
||||||
|
dockedKeyboardActionDetected = true;
|
||||||
if(settings.liftStreamViewForKeyboard && !isInputingText){
|
if(settings.liftStreamViewForKeyboard && !isInputingText){
|
||||||
isInputingText = true;
|
isInputingText = true;
|
||||||
|
|
||||||
@@ -306,6 +309,29 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
|||||||
NSLog(@"keyboard will show %f", CACurrentMediaTime());
|
NSLog(@"keyboard will show %f", CACurrentMediaTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)handleAbnormalKeyboards:(NSNotification *)notification{
|
||||||
|
dispatch_time_t delayTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC));
|
||||||
|
dispatch_after(delayTime, dispatch_get_main_queue(), ^{// Code to execute after the delay
|
||||||
|
if(!self->dockedKeyboardActionDetected){
|
||||||
|
[self->keyboardToggleTip removeFromSuperview];
|
||||||
|
self->dockedKeyboardActionDetected = false;
|
||||||
|
self->isInputingText = !self->isInputingText;
|
||||||
|
[self->keyInputField removeFromSuperview];
|
||||||
|
|
||||||
|
AlertControllerUtil.autoCompletion = true;
|
||||||
|
[AlertControllerUtil showAlertIn:self->_streamFrameVC
|
||||||
|
title:@""
|
||||||
|
message:[LocalizationHelper localizedStringForKey:@"Floating keyboard not supported"]
|
||||||
|
withCancel:NO
|
||||||
|
buttonTitle:@""
|
||||||
|
countdown:1
|
||||||
|
action:^{}
|
||||||
|
completion:^{}];
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
- (UIViewController *)parentViewController {
|
- (UIViewController *)parentViewController {
|
||||||
UIResponder *responder = self;
|
UIResponder *responder = self;
|
||||||
while (responder) {
|
while (responder) {
|
||||||
@@ -319,6 +345,7 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5;
|
|||||||
|
|
||||||
// this method also deals with recovering streamview when local keyboard is turned off
|
// this method also deals with recovering streamview when local keyboard is turned off
|
||||||
- (void)keyboardWillHide{
|
- (void)keyboardWillHide{
|
||||||
|
dockedKeyboardActionDetected = true;
|
||||||
// NSLog(@"keyboard will hide markmark %f", CACurrentMediaTime());
|
// NSLog(@"keyboard will hide markmark %f", CACurrentMediaTime());
|
||||||
|
|
||||||
keyboardToggleRecognizer.numberOfTouchesRequired = settings.keyboardToggleFingers.intValue; // reset this number
|
keyboardToggleRecognizer.numberOfTouchesRequired = settings.keyboardToggleFingers.intValue; // reset this number
|
||||||
|
|||||||
@@ -704,19 +704,19 @@
|
|||||||
"zh-Hans" : {
|
"zh-Hans" : {
|
||||||
"stringUnit" : {
|
"stringUnit" : {
|
||||||
"state" : "translated",
|
"state" : "translated",
|
||||||
"value" : "断开"
|
"value" : "断开连接"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"zh-Hant" : {
|
"zh-Hant" : {
|
||||||
"stringUnit" : {
|
"stringUnit" : {
|
||||||
"state" : "translated",
|
"state" : "translated",
|
||||||
"value" : "斷開"
|
"value" : "斷開連接"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"zh-HK" : {
|
"zh-HK" : {
|
||||||
"stringUnit" : {
|
"stringUnit" : {
|
||||||
"state" : "translated",
|
"state" : "translated",
|
||||||
"value" : "斷開"
|
"value" : "斷開連接"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4953,6 +4953,29 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"Floating keyboard not supported" : {
|
||||||
|
"extractionState" : "manual",
|
||||||
|
"localizations" : {
|
||||||
|
"zh-Hans" : {
|
||||||
|
"stringUnit" : {
|
||||||
|
"state" : "translated",
|
||||||
|
"value" : "不支持悬浮键盘"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"zh-Hant" : {
|
||||||
|
"stringUnit" : {
|
||||||
|
"state" : "translated",
|
||||||
|
"value" : "不支援懸浮鍵盤"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"zh-HK" : {
|
||||||
|
"stringUnit" : {
|
||||||
|
"state" : "translated",
|
||||||
|
"value" : "不支援懸浮鍵盤"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"Folder" : {
|
"Folder" : {
|
||||||
"extractionState" : "manual",
|
"extractionState" : "manual",
|
||||||
"localizations" : {
|
"localizations" : {
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
+2
-2
@@ -1384,8 +1384,8 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg
|
|||||||
let currentProfile = profilesManager.getSelectedProfile()
|
let currentProfile = profilesManager.getSelectedProfile()
|
||||||
// currentProfile.name = "RPG游戏示例 / RPG example (ZZZ in Genshin style)"
|
// currentProfile.name = "RPG游戏示例 / RPG example (ZZZ in Genshin style)"
|
||||||
currentProfile.name = "Default"
|
currentProfile.name = "Default"
|
||||||
// currentProfile.name = "Default";
|
// currentProfile.name = "Editable default";
|
||||||
// profilesManager.replace(targetProfile as! OSCProfile, with: currentProfile)
|
profilesManager.replace(targetProfile as! OSCProfile, with: currentProfile)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
clearSickInput()
|
clearSickInput()
|
||||||
|
|||||||
@@ -542,6 +542,11 @@
|
|||||||
name:UIKeyboardWillShowNotification
|
name:UIKeyboardWillShowNotification
|
||||||
object:nil];
|
object:nil];
|
||||||
|
|
||||||
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||||
|
selector:@selector(handleAbnormalKeyboards:)
|
||||||
|
name:UIKeyboardWillChangeFrameNotification
|
||||||
|
object:nil];
|
||||||
|
|
||||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||||
selector:@selector(keyboardWillHide)
|
selector:@selector(keyboardWillHide)
|
||||||
name:UIKeyboardWillHideNotification
|
name:UIKeyboardWillHideNotification
|
||||||
@@ -763,6 +768,10 @@
|
|||||||
[_streamView keyboardWillHide];
|
[_streamView keyboardWillHide];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (void)handleAbnormalKeyboards:(NSNotification *)notification{
|
||||||
|
[_streamView handleAbnormalKeyboards:notification];
|
||||||
|
}
|
||||||
|
|
||||||
- (void)handleWidgetLayoutGesture{
|
- (void)handleWidgetLayoutGesture{
|
||||||
[self configOscLayoutTool];
|
[self configOscLayoutTool];
|
||||||
[self openWidgetLayoutTool];
|
[self openWidgetLayoutTool];
|
||||||
|
|||||||
Reference in new issue
Block a user