- OnScreenButtonView refactored to OnScreenWidgetView

- oscLayer guideline alignment with onScreenWidgetViews

Limelight/Input/CustomTapGestureRecognizer.m

@@ -74,7 +74,7 @@ static CGFloat screenWidthInPoints;
         _gestureCaptured = false;
         self.state = UIGestureRecognizerStateFailed;
     }
-    else if(_gestureCaptured && allTouchesCount == [touches count] && !_isOnScreenControllerBeingPressed && ![self isOnScreenButtonViewBeingPressed]){  //must exclude virtual controller & onscreen button taps here to prevent stucked button, _areVirtualControllerTaps flag is set by onscreencontrols, containOnScreenButtonsTaps will be returned by iterating all button views in streamframeview
+    else if(_gestureCaptured && allTouchesCount == [touches count] && !_isOnScreenControllerBeingPressed && ![self isOnScreenWidgetViewBeingPressed]){  //must exclude virtual controller & onscreen button taps here to prevent stucked button, _areVirtualControllerTaps flag is set by onscreencontrols, containOnScreenButtonsTaps will be returned by iterating all widget views in streamframeview
         _gestureCaptured = false; //reset for next recognition
         if((CACurrentMediaTime() - _gestureCapturedTime) < _tapDownTimeThreshold){
             lowestTouchPointYCoord = 0.0; //reset for next recognition
@@ -85,28 +85,28 @@ static CGFloat screenWidthInPoints;
 }
 
 
-// it was a not a perfect choice to code OnScreenButtonView in Swift...
+// it was a not a perfect choice to code OnScreenWidgetView in Swift...
 // we're unable to import this class to swift codebase by the bridging header,and have to exlucde the onscreen button taps here
-// by iterating every button view instances. but it's basically ok since the number of buttonViews are always limited.
+// by iterating every widget view instances. but it's basically ok since the number of widgetViews are always limited.
 // and this method will only be called when the recognizer is active & and the taps passes all the checks and is about to ge triggered.
-- (bool)isOnScreenButtonViewBeingPressed {
-    NSTimeInterval allFingersTapDownTime = CACurrentMediaTime() - _gestureCapturedTime; //RIGHTCLICK_TAP_DOWN_TIME_THRESHOLD_S has been passed to this recognizer as _tapDownTimeShreshold, we'll decide how to deal with pressed flag of on-screen button views based on tapDownTime
-    bool gotOneButtonPressed = false;
-    // the tap gestures are all added to the streamFrameTopLayerView, where all the onScreenButtonViews are added. so we can iterate them in this way:
+- (bool)isOnScreenWidgetViewBeingPressed {
+    NSTimeInterval allFingersTapDownTime = CACurrentMediaTime() - _gestureCapturedTime; //RIGHTCLICK_TAP_DOWN_TIME_THRESHOLD_S has been passed to this recognizer as _tapDownTimeShreshold, we'll decide how to deal with pressed flag of on-screen widget views based on tapDownTime
+    bool gotOneWidgetPressed = false;
+    // the tap gestures are all added to the streamFrameTopLayerView, where all the OnScreenWidgetViews are added. so we can iterate them in this way:
     for(UIView* view in self.view.subviews){
-        if ([view isKindOfClass:[OnScreenButtonView class]]) {
-            OnScreenButtonView* buttonView = (OnScreenButtonView*) view;
-            if(gotOneButtonPressed && allFingersTapDownTime <= _tapDownTimeThreshold){ // once we have just 1 button pressed already,& the tapDownTime has not exceeded the threshold, we'll reset pressed flag for the all the buttonViews.
-                buttonView.pressed = false; //reset the flag for buttonView
+        if ([view isKindOfClass:[OnScreenWidgetView class]]) {
+            OnScreenWidgetView* widgetView = (OnScreenWidgetView*) view;
+            if(gotOneWidgetPressed && allFingersTapDownTime <= _tapDownTimeThreshold){ // once we have just 1 button pressed already,& the tapDownTime has not exceeded the threshold, we'll reset pressed flag for the all the widgetViews.
+                widgetView.pressed = false; //reset the flag for widgetView
                 continue;
             }
-            if(buttonView.pressed){
-                gotOneButtonPressed = true; //got one button pressed
-                if(allFingersTapDownTime <= _tapDownTimeThreshold) buttonView.pressed = false; // reset the flag for current buttonView if tapDowntime is still within the threshold, if not, leave the flag for mouse scroller gesture in relative touch mode.
+            if(widgetView.pressed){
+                gotOneWidgetPressed = true; //got one button pressed
+                if(allFingersTapDownTime <= _tapDownTimeThreshold) widgetView.pressed = false; // reset the flag for current widgetView if tapDowntime is still within the threshold, if not, leave the flag for mouse scroller gesture in relative touch mode.
             }
         }
     }
-    return gotOneButtonPressed;
+    return gotOneWidgetPressed;
 }
 
 @end