- on-screen button & on-screen controller resize test

Limelight/Input/CustomOSC/LayoutOnScreenControls.h

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport
        streamConfig:(StreamConfiguration*)streamConfig oscLevel:(int)oscLevel;
 
-- (CALayer*) buttonLayerFromName:(NSString*)name;
+- (CALayer*) controllerLayerFromName:(NSString*)name;
 - (BOOL) isLayer:(CALayer*)layer hoveringOverButton:(UIButton*)button;
 
 - (void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;

Limelight/Input/CustomOSC/LayoutOnScreenControls.m

@@ -113,7 +113,7 @@
 }
 
 /* returns reference to button layer object given the button's name*/
-- (CALayer*)buttonLayerFromName: (NSString*)name {
+- (CALayer*)controllerLayerFromName: (NSString*)name {
     for (CALayer *buttonLayer in self.OSCButtonLayers) {
         
         if ([buttonLayer.name isEqualToString:name]) {
@@ -159,10 +159,21 @@
         else if (layer == self._leftStick) {  // only let user drag left stick's background, not the inner analog stick itself
             layerBeingDragged = self._leftStickBackground;
         }
-        else {    // let user drag whatever other valid button they're touching
+        else if(layer == self._aButton ||
+                layer == self._bButton ||
+                layer == self._xButton ||
+                layer == self._yButton ||
+                layer == self._l1Button ||
+                layer == self._l2Button ||
+                layer == self._r1Button ||
+                layer == self._r2Button ||
+                layer == self._selectButton ||
+                layer == self._startButton){    // we must iterates all the controller button layers manually here, to prevent other widgets being dragged accidently
             layerBeingDragged = layer;
         }
         
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"ControllerCALayerSelected" object:layerBeingDragged]; // inform that a CALayer of onScreen controller has being selected
+        
         /* save the name, position, and visibility of button being touched in array in case user wants to undo the change later */
         OnScreenButtonState *onScreenButtonState = [[OnScreenButtonState alloc] initWithButtonName:layerBeingDragged.name buttonType:GameControllerButton andPosition:layerBeingDragged.position];
         // add hidden attr here
@@ -241,4 +252,5 @@
 
 
 
+
 @end

Limelight/Input/CustomOSC/OSCProfilesManager.m

@@ -200,7 +200,7 @@ static NSMutableDictionary *onScreenButtonViewsDict;
 
 
 - (bool) updateSelectedProfile:(NSMutableArray *) oscButtonLayers {
-    NSMutableArray* buttonStatesEncoded = [self convertOnscreenButtonsToButtonStates:oscButtonLayers];
+    NSMutableArray* buttonStatesEncoded = [self convertOnScreenControllerAndButtonsToButtonStates:oscButtonLayers];
     if([self getIndexOfSelectedProfile]==0) return false;
     OSCProfile *newProfile = [[OSCProfile alloc] initWithName:[self getSelectedProfile].name
                             buttonStates:buttonStatesEncoded isSelected:YES];        // create a new 'OSCProfile'. Set the array of encoded button states created above to the 'buttonStates' property of the new profile, along with a 'name'. Set 'isSelected' argument to YES which will set this saved profile as the one that will show up in the game stream view
@@ -217,7 +217,7 @@ static NSMutableDictionary *onScreenButtonViewsDict;
 
 
 - (void) saveProfileWithName:(NSString*)name andButtonLayers:(NSMutableArray *)oscButtonLayers {
-    NSMutableArray* buttonStatesEncoded = [self convertOnscreenButtonsToButtonStates:oscButtonLayers];
+    NSMutableArray* buttonStatesEncoded = [self convertOnScreenControllerAndButtonsToButtonStates:oscButtonLayers];
     OSCProfile *newProfile = [[OSCProfile alloc] initWithName:name
                             buttonStates:buttonStatesEncoded isSelected:YES];        // create a new 'OSCProfile'. Set the array of encoded button states created above to the 'buttonStates' property of the new profile, along with a 'name'. Set 'isSelected' argument to YES which will set this saved profile as the one that will show up in the game stream view
     /* set all saved OSCProfiles 'isSelected' property to NO since the new profile you're adding will be set as the selected profile */
@@ -243,7 +243,7 @@ static NSMutableDictionary *onScreenButtonViewsDict;
 }
 
 
-- (NSMutableArray* ) convertOnscreenButtonsToButtonStates:(NSMutableArray *) oscButtonLayers {
+- (NSMutableArray* ) convertOnScreenControllerAndButtonsToButtonStates:(NSMutableArray *) oscButtonLayers {
     /* iterate through each OSC button the user sees on screen, create an 'OnScreenButtonState' object from each button, encode each object, and then add each object to an array */
     /*
     NSSet *validPositionButtonNames = [NSSet setWithObjects:
@@ -262,6 +262,8 @@ static NSMutableDictionary *onScreenButtonViewsDict;
         @"startButton",
         nil]; */
     NSMutableArray *buttonStatesEncoded = [[NSMutableArray alloc] init];
+    
+    // save on-screen game controller buttons & sticks as buttonstate:
     for (CALayer *oscButtonLayer in oscButtonLayers) {
         
         OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:oscButtonLayer.name buttonType:GameControllerButton andPosition:oscButtonLayer.position];
@@ -271,12 +273,14 @@ static NSMutableDictionary *onScreenButtonViewsDict;
         [buttonStatesEncoded addObject: buttonStateEncoded];
     }
     
-    // save keyboard button as buttonstate, this is for the new onscreen keyboard buttons:
+    // save on-screen button views (keyboard & mouse command) as buttonstate:
     [onScreenButtonViewsDict enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL *stop) { // this dict is passed from the layout tool VC, as a static obj in this class.
         OnScreenButtonView *buttonView = value;
         OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:buttonView.keyString buttonType:KeyboardOrMouseButton andPosition:buttonView.frame.origin];
         buttonState.alias = buttonView.keyLabel;
         buttonState.timestamp = buttonView.timestamp;
+        buttonState.widthFactor = buttonView.widthFactor;
+        buttonState.heightFactor = buttonView.heightFactor;
         NSData *buttonStateEncoded = [NSKeyedArchiver archivedDataWithRootObject:buttonState requiringSecureCoding:YES error:nil];
         [buttonStatesEncoded addObject: buttonStateEncoded];
     }];

Limelight/Input/CustomOSC/OnScreenButtonState.h

@@ -25,6 +25,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL isHidden;
 @property (nonatomic, assign) uint8_t buttonType;
 @property (nonatomic, assign) NSTimeInterval timestamp;
+@property (nonatomic, assign) CGFloat widthFactor; // for OnScreenButtonView
+@property (nonatomic, assign) CGFloat heightFactor; // for OnScreenButtonView
+
 // @property (nonatomic, assign) BOOL hasValidPosition;
 
 typedef NS_ENUM(NSInteger, OnScreenButtonType) {

Limelight/Input/CustomOSC/OnScreenButtonState.m

@@ -33,6 +33,8 @@
     [encoder encodeInt:self.buttonType forKey:@"buttonType"];
     [encoder encodeCGPoint:self.position forKey:@"position"];
     [encoder encodeBool:self.isHidden forKey:@"isHidden"];
+    [encoder encodeFloat:self.widthFactor forKey:@"widthFactor"];
+    [encoder encodeFloat:self.heightFactor forKey:@"heightFactor"];
 }
 
 - (id) initWithCoder:(NSCoder*)decoder {
@@ -43,6 +45,8 @@
         self.buttonType = [decoder decodeIntForKey:@"buttonType"];
         self.position = [decoder decodeCGPointForKey:@"position"];
         self.isHidden = [decoder decodeBoolForKey:@"isHidden"];
+        self.widthFactor = [decoder decodeFloatForKey:@"widthFactor"];
+        self.heightFactor = [decoder decodeFloatForKey:@"heightFactor"];
     }
     
     return self;