- button-touchPad hybrid widgets

- minimum stick offset for stick widgets
- expand controller cmd strings to playStation style

Limelight/Input/CustomOSC/OSCProfilesManager.m

@@ -291,8 +291,8 @@ static NSMutableSet *OnScreenWidgetViews;
     
     // save on-screen widget views (keyboard & mouse command) as buttonstate:
     for(OnScreenWidgetView* widgetView in OnScreenWidgetViews){
-        OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:widgetView.keyString buttonType:CustomOnScreenWidget andPosition:widgetView.center];
-        buttonState.alias = widgetView.keyLabel;
+        OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:widgetView.cmdString buttonType:CustomOnScreenWidget andPosition:widgetView.center];
+        buttonState.alias = widgetView.buttonLabel;
         buttonState.widthFactor = widgetView.widthFactor;
         buttonState.heightFactor = widgetView.heightFactor;
         buttonState.backgroundAlpha = widgetView.backgroundAlpha;
@@ -300,6 +300,7 @@ static NSMutableSet *OnScreenWidgetViews;
         buttonState.sensitivityFactor = widgetView.sensitivityFactor;
         buttonState.stickIndicatorOffset = widgetView.stickIndicatorOffset;
         buttonState.widgetShape = widgetView.shape;
+        buttonState.minStickOffset = widgetView.minStickOffset;
         
         NSData *buttonStateEncoded = [NSKeyedArchiver archivedDataWithRootObject:buttonState requiringSecureCoding:YES error:nil];
         [buttonStatesEncoded addObject: buttonStateEncoded];

Limelight/Input/CustomOSC/OnScreenButtonState.h

@@ -29,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) CGFloat borderWidth; // for OnScreenWidgetView
 @property (nonatomic, assign) CGFloat sensitivityFactor; // for OnScreenWidgetView
 @property (nonatomic, assign) CGFloat stickIndicatorOffset; // for OnScreenWidgetView
+@property (nonatomic, assign) CGFloat minStickOffset; // for OnScreenWidgetView
 @property NSString* widgetShape; // for OnScreenWidgetView
 
 @property (nonatomic, assign) CGFloat oscLayerSizeFactor; // for OnScreenController CALayer

Limelight/Input/CustomOSC/OnScreenButtonState.m

@@ -40,6 +40,7 @@
     [encoder encodeFloat:self.backgroundAlpha forKey:@"backgroundAlpha"];
     [encoder encodeFloat:self.borderWidth forKey:@"borderWidth"];
     [encoder encodeObject:self.widgetShape forKey:@"widgetShape"];
+    [encoder encodeFloat:self.minStickOffset forKey:@"minStickOffset"];
 }
 
 - (id) initWithCoder:(NSCoder*)decoder {
@@ -57,6 +58,7 @@
         self.backgroundAlpha = [decoder decodeFloatForKey:@"backgroundAlpha"];
         self.borderWidth = [decoder decodeFloatForKey:@"borderWidth"];
         self.widgetShape = [decoder decodeObjectForKey:@"widgetShape"];
+        self.minStickOffset = [decoder decodeFloatForKey:@"minStickOffset"];
     }
     return self;
 }