- OnScreenButtonView refactored to OnScreenWidgetView

- oscLayer guideline alignment with onScreenWidgetViews

Limelight/Input/CustomOSC/LayoutOnScreenControls.m

@@ -10,7 +10,7 @@
 #import "OSCProfilesTableViewController.h"
 #import "OnScreenButtonState.h"
 #import "OSCProfilesManager.h"
-
+#import "Moonlight-Swift.h"
 
 @interface LayoutOnScreenControls ()
 @end
@@ -209,30 +209,44 @@
      -Change horizontal guideline color to white if its y-position is almost equal to that of one of the buttons on screen.
      -Change vertical guideline color to white if its x-position is almost equal to that of one of the buttons on screen.
      */
+    horizontalGuideline.backgroundColor = [UIColor blueColor]; // change horizontal guideline back to blue if it doesn't line up with one of the on screen buttons
     for (CALayer *button in self.OSCButtonLayers) { // horizontal guideline position check
-        
         if ((layerBeingDragged != button) && !button.isHidden) {
             if ((horizontalGuideline.center.y < button.position.y + 1) &&
                 (horizontalGuideline.center.y > button.position.y - 1)) {
-                horizontalGuideline.backgroundColor = [UIColor whiteColor];
+                horizontalGuideline.backgroundColor = [UIColor yellowColor];
                 break;
             }
         }
-        
-        horizontalGuideline.backgroundColor = [UIColor blueColor]; // change horizontal guideline back to blue if it doesn't line up with one of the on screen buttons
     }
+    for(UIView* view in self.layoutToolVC.view.subviews){
+        if ([view isKindOfClass:[OnScreenWidgetView class]]) {
+            if ((horizontalGuideline.center.y < view.center.y + 1) && (horizontalGuideline.center.y > view.center.y - 1)) {
+                horizontalGuideline.backgroundColor = [UIColor yellowColor];
+                break;
+            }
+        }
+    }
+
+    verticalGuideline.backgroundColor = [UIColor blueColor]; // change vertical guideline back to blue if it doesn't line up with one of the on screen buttons
     for (CALayer *button in self.OSCButtonLayers) { // vertical guideline position check
-        
         if ((layerBeingDragged != button) && !button.isHidden) {
             if ((verticalGuideline.center.x < button.position.x + 1) &&
                 (verticalGuideline.center.x > button.position.x - 1)) {
-                verticalGuideline.backgroundColor = [UIColor whiteColor];
+                verticalGuideline.backgroundColor = [UIColor yellowColor];
                 break;
             }
         }
-        
-        verticalGuideline.backgroundColor = [UIColor blueColor]; // change vertical guideline back to blue if it doesn't line up with one of the on screen buttons
     }
+    for(UIView* view in self.layoutToolVC.view.subviews){
+        if ([view isKindOfClass:[OnScreenWidgetView class]]) {
+            if ((verticalGuideline.center.x < view.center.x + 1) && (verticalGuideline.center.x > view.center.x - 1)) {
+                verticalGuideline.backgroundColor = [UIColor yellowColor];
+                break;
+            }
+        }
+    }
+
 }
 
 - (void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {