From ce21c398b5daa138d4ada798d83f77e54a9a8447 Mon Sep 17 00:00:00 2001
From: TrueZhuanjia <veimin@foxmail.com>
Date: Fri, 25 Jul 2025 00:36:04 +0800
Subject: [PATCH] - fix on-screen widget tool selectedWidgetView bug - update &
 replace new widget template bin file

---
 VoidLink/Input/CustomOSC/OSCProfile.h         |   3 +-
 VoidLink/Input/CustomOSC/OSCProfilesManager.h |   2 +-
 VoidLink/Input/CustomOSC/OSCProfilesManager.m |  12 +++++---
 VoidLink/Input/OnScreenWidgetView.swift       |   2 +-
 VoidLink/PresetConfigs/widgetTemplates.bin    | Bin 50741 -> 125388 bytes
 .../LayoutOnScreenControlsViewController.m    |  28 +++++++++---------
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/VoidLink/Input/CustomOSC/OSCProfile.h b/VoidLink/Input/CustomOSC/OSCProfile.h
index ff22b639..04dc2af5 100644
--- a/VoidLink/Input/CustomOSC/OSCProfile.h
+++ b/VoidLink/Input/CustomOSC/OSCProfile.h
@@ -13,7 +13,8 @@
 #import "OnScreenButtonState.h"
 
 NS_ASSUME_NONNULL_BEGIN
-#define DEFAULT_TEMPLATE_NAME @"高级控件模板(Advanced widget templates)"
+#define DEFAULT_TEMPLATE_NAME1 @"控件模板 / Widget templates"
+#define DEFAULT_TEMPLATE_NAME2 @"旧版屏显控件 / Legacy on-screen controls"
 
 /**
  This object contains information pertaining to any of the user created, custom on screen controller layout configurations, or 'profiles.' The object contains a 'name' property for easy reference, as well as an 'isSelected' property which is used to determine whether this particular custom OSC layout should show on screen during game stream view. Only one 'OSCProfile' is set to 'isSelected' at any given time. The object also contains an array of 'OnScreenButtonStates' which provides information that allows us to move and hide/unhide each of the 19 on screen buttons. Note that the 'buttonStates' property should contain an NSMutableArray of ENCODED 'OnScreenButtonState' objects. This allows us to save the 'OSCProfile' object to NSUserDefaults.
diff --git a/VoidLink/Input/CustomOSC/OSCProfilesManager.h b/VoidLink/Input/CustomOSC/OSCProfilesManager.h
index 93cf5afc..58cc6bf3 100644
--- a/VoidLink/Input/CustomOSC/OSCProfilesManager.h
+++ b/VoidLink/Input/CustomOSC/OSCProfilesManager.h
@@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Lets the caller of this method know whether a profile with a given name already exists in persistent storage
  */
 - (BOOL) profileNameAlreadyExist:(NSString*)name;
-- (BOOL) profileName:(NSString*) name alreadyExistIn:(NSMutableArray*)profiles;
+- (OSCProfile *) findProfileByName:(NSString*) name inProfileArray:(NSMutableArray*)profiles;
 
 @end
 
diff --git a/VoidLink/Input/CustomOSC/OSCProfilesManager.m b/VoidLink/Input/CustomOSC/OSCProfilesManager.m
index fd469676..bc1e0141 100644
--- a/VoidLink/Input/CustomOSC/OSCProfilesManager.m
+++ b/VoidLink/Input/CustomOSC/OSCProfilesManager.m
@@ -142,7 +142,11 @@ static CGRect streamViewBounds;
 
 - (void) importEncodedProfiles:(NSMutableArray* )profilesEncoded {
     NSMutableArray* targetProfiles = [_currentProfiles mutableCopy]; //_currentProfiles is availabled as long as getAllProfiles was called before calling this method (_currentProfiles avoids frequent accessing persisted data)
-    if([self profileName:DEFAULT_TEMPLATE_NAME alreadyExistIn:targetProfiles] && targetProfiles.count > 1) [targetProfiles removeObjectAtIndex:1];
+    OSCProfile* profile;
+    profile = [self findProfileByName:DEFAULT_TEMPLATE_NAME1 inProfileArray:targetProfiles];
+    if(profile && targetProfiles.count > 1) [targetProfiles removeObject:profile];
+    profile = [self findProfileByName:DEFAULT_TEMPLATE_NAME2 inProfileArray:targetProfiles];
+    if(profile && targetProfiles.count > 1) [targetProfiles removeObject:profile];
     if(targetProfiles.count > 0) [targetProfiles removeObjectAtIndex:0];
     NSMutableArray* localEncodedPofiles = [self encodedProfilesFromArray:targetProfiles];
     [profilesEncoded addObjectsFromArray:localEncodedPofiles];
@@ -393,14 +397,14 @@ static CGRect streamViewBounds;
     return NO;
 }
 
-- (BOOL) profileName:(NSString*) name alreadyExistIn:(NSMutableArray*)profiles {
+- (OSCProfile *) findProfileByName:(NSString*) name inProfileArray:(NSMutableArray*)profiles {
     /* Iterate through the decoded profiles and return 'YES' if one of the profiles' 'name' properties equals the 'name' passed into this method */
     for (OSCProfile *profile in profiles) {
         if ([profile.name isEqualToString:name]) {
-            return YES;
+            return profile;
         }
     }
-    return NO;
+    return nil;
 }
 
 - (OnScreenButtonState *)unarchiveButtonStateEncoded:(NSData *)data {
diff --git a/VoidLink/Input/OnScreenWidgetView.swift b/VoidLink/Input/OnScreenWidgetView.swift
index f2e0c994..cca8b716 100644
--- a/VoidLink/Input/OnScreenWidgetView.swift
+++ b/VoidLink/Input/OnScreenWidgetView.swift
@@ -587,7 +587,7 @@ import UIKit
             // illustrate offset distance in edit mode
             // let offsetSign = self.selfViewOnTheRight ? -1 : 1 // dprecated
             // let illlustrationPoint = CGPointMake(CGRectGetMidX(self.frame), CGRectGetMaxY(self.frame)/4)
-            self.crossMarkLayer.position = CGPointMake(CGRectGetMidX(self.stickBallLayer.frame), CGRectGetMidY(self.stickBallLayer.frame)-stickIndicatorOffset)
+            self.stickBallLayer.position = CGPointMake(CGRectGetMidX(self.crossMarkLayer.frame), CGRectGetMidY(self.crossMarkLayer.frame)-stickIndicatorOffset)
         }
         CATransaction.commit()
     }
diff --git a/VoidLink/PresetConfigs/widgetTemplates.bin b/VoidLink/PresetConfigs/widgetTemplates.bin
index 4ca211d17b6f5eaf848555462eb535e404e2e0d3..5d091aa22d00de634a849a2b2cc38df741bac9e3 100755
GIT binary patch
literal 125388
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
Q!U&-mplKS)V|>W~000%dDgXcg

literal 50741
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

diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
index e1ca4231..fd720ff9 100644
--- a/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
+++ b/VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m
@@ -81,9 +81,8 @@
 - (void) reloadOnScreenWidgetViews {
     NSLog(@"reloadOnScreenWidgets %f", CACurrentMediaTime());
     OnScreenWidgetView.editMode = true;
-    [self->selectedWidgetView.stickBallLayer removeFromSuperlayer];
-    [self->selectedWidgetView.crossMarkLayer removeFromSuperlayer];
-    
+    [self clearStickIndicator];
+
     for (UIView *subview in self.view.subviews) {
         if ([subview isKindOfClass:[OnScreenWidgetView class]]) {
             [subview removeFromSuperview];
@@ -168,7 +167,7 @@
      [profilesManager saveProfileWithName:@"Default" andButtonLayers:self.layoutOSC.OSCButtonLayers];
      [profilesManager importDefaultTemplates];
      }*/
-    if (![profilesManager profileName:DEFAULT_TEMPLATE_NAME alreadyExistIn:allProfiles]){
+    if (![profilesManager findProfileByName:DEFAULT_TEMPLATE_NAME1 inProfileArray:allProfiles]){
         [profilesManager importDefaultTemplates];
     }
         
@@ -655,6 +654,11 @@
     label.numberOfLines = 1;
 }
 
+- (void)clearStickIndicator{
+    [self->selectedWidgetView.stickBallLayer removeFromSuperlayer];
+    [self->selectedWidgetView.crossMarkLayer removeFromSuperlayer];
+}
+
 - (void)widgetViewTapped: (NSNotification *)notification{
     //self.undoButton.alpha = selectedWidgetView.layoutChanges.count>1 && !CGPointEqualToPoint(selectedWidgetView.layoutChanges.lastObject.CGPointValue, selectedWidgetView.initialCenter)? 1.0 : 0.3;
 
@@ -663,8 +667,7 @@
 
     OnScreenWidgetView* widgetView = (OnScreenWidgetView* )notification.object;
     
-    [self->selectedWidgetView.stickBallLayer removeFromSuperlayer];
-    [self->selectedWidgetView.crossMarkLayer removeFromSuperlayer];
+    [self clearStickIndicator];
     self->widgetViewSelected = true;
     self->controllerLayerSelected = false;
     self->selectedWidgetView = widgetView;
@@ -705,8 +708,7 @@
     }
     if(showStickIndicatorOffsetStack){
         // illustrating the indicator offset,
-        [selectedWidgetView.stickBallLayer removeFromSuperlayer];
-        [selectedWidgetView.crossMarkLayer removeFromSuperlayer];
+        [self clearStickIndicator];
         selectedWidgetView.touchBeganLocation = CGPointMake(CGRectGetWidth(selectedWidgetView.frame)/2, CGRectGetHeight(selectedWidgetView.frame)/4);
         [selectedWidgetView showStickIndicator];// this will create the indicator CAShapeLayers
         [self.stickIndicatorOffsetSlider setValue:self->selectedWidgetView.stickIndicatorOffset];
@@ -743,8 +745,7 @@
 - (void)legacyOscLayerTapped: (NSNotification *)notification{
     [self enableCommonWidgetTools];
     CALayer* controllerLayer = (CALayer* )notification.object;
-    [self->selectedWidgetView.stickBallLayer removeFromSuperlayer];
-    [self->selectedWidgetView.crossMarkLayer removeFromSuperlayer];
+    [self clearStickIndicator];
     self->widgetViewSelected = false;
     self->selectedWidgetView = nil;
     
@@ -1120,6 +1121,8 @@
 
 - (void) presentProfilesTableView{
     [self saveTapped:nil];
+    [self clearStickIndicator];
+    selectedWidgetView = nil;
     UIStoryboard *storyboard;
     BOOL isIPhone = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
     if (isIPhone) {
@@ -1144,8 +1147,6 @@
 
     self.widgetPanelStack.hidden = YES;
     
-    [self->selectedWidgetView.stickBallLayer removeFromSuperlayer];
-    [self->selectedWidgetView.crossMarkLayer removeFromSuperlayer];
     _oscProfilesTableViewController.currentOSCButtonLayers = self.layoutOSC.OSCButtonLayers;
     
     [self presentViewController:_oscProfilesTableViewController animated:YES completion:nil];
@@ -1252,8 +1253,7 @@
     if(!isToolbarHidden && self->selectedWidgetView != nil && [self layerIsOverlappingWithTrashcanButton:selectedWidgetView.layer]){
         [self->selectedWidgetView removeFromSuperview];
         [self.OnScreenWidgetViews removeObject:self->selectedWidgetView];
-        [selectedWidgetView.stickBallLayer removeFromSuperlayer];
-        [selectedWidgetView.crossMarkLayer removeFromSuperlayer];
+        [self clearStickIndicator];
         [selectedWidgetView.buttonDownVisualEffectLayer removeFromSuperlayer];
     }