Force all clickable buttons/switches to layer 20

JonnyOThan · JonnyOThan · commit 302bbf455aaa · 2023-02-22T11:45:40.000-05:00
diff --git a/RasterPropMonitor/Core/ButtonHandler.cs b/RasterPropMonitor/Core/ButtonHandler.cs
@@ -220,11 +220,12 @@ public static void CreateButton(InternalProp thatProp, string buttonName, int nu
 
         public static void CreateButton(InternalProp thatProp, string buttonName, Action handlerFunction, Action releaseHandlerFunction = null, InternalModel thatModel = null)
         {
-            SmarterButton buttonBehaviour;
-            if ((buttonBehaviour = AttachBehaviour(thatProp, thatModel, buttonName)) == null)
+            SmarterButton buttonBehaviour = AttachBehaviour(thatProp, thatModel, buttonName);
+            if (buttonBehaviour == null)
             {
                 return;
             }
+            buttonBehaviour.gameObject.layer = 20; // everything clickable needs to be on layer 20 because FreeIva disables mouse interaction with layer 16.
             buttonBehaviour.clickHandlers.Add(handlerFunction);
             if (releaseHandlerFunction != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -220,11 +220,12 @@ public static void CreateButton(InternalProp thatProp, string buttonName, int nu`
`220`	`220`
`221`	`221`	`public static void CreateButton(InternalProp thatProp, string buttonName, Action handlerFunction, Action releaseHandlerFunction = null, InternalModel thatModel = null)`
`222`	`222`	`{`
`223`		`- SmarterButton buttonBehaviour;`
`224`		`- if ((buttonBehaviour = AttachBehaviour(thatProp, thatModel, buttonName)) == null)`
	`223`	`+ SmarterButton buttonBehaviour = AttachBehaviour(thatProp, thatModel, buttonName);`
	`224`	`+ if (buttonBehaviour == null)`
`225`	`225`	`{`
`226`	`226`	`return;`
`227`	`227`	`}`
	`228`	`+ buttonBehaviour.gameObject.layer = 20; // everything clickable needs to be on layer 20 because FreeIva disables mouse interaction with layer 16.`
`228`	`229`	`buttonBehaviour.clickHandlers.Add(handlerFunction);`
`229`	`230`	`if (releaseHandlerFunction != null)`
`230`	`231`	`{`