Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit 97a82c1

Browse files
committed
Make sure mouse is in target display for resize/dragging/panel operations
1 parent 96a1cc6 commit 97a82c1

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/UI/DisplayManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public static class DisplayManager
1919
public static int Height => ActiveDisplay.renderingHeight;
2020

2121
public static Vector3 MousePosition => Display.RelativeMouseAt(InputManager.MousePosition);
22+
public static bool MouseInTargetDisplay => MousePosition.z == ActiveDisplayIndex;
2223

2324
private static Camera canvasCamera;
2425

src/UI/Panels/PanelDragger.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ public static void OnPanelsReordered()
6767

6868
public static void UpdateInstances()
6969
{
70+
if (!DisplayManager.MouseInTargetDisplay)
71+
return;
72+
7073
if (!resizeCursorObj)
7174
CreateCursorUI();
7275

src/UI/Panels/UIPanel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public static void UpdateFocus()
3333
return;
3434

3535
// if the user is clicking
36-
if (InputManager.GetMouseButtonDown(0) || InputManager.GetMouseButtonDown(1))
36+
if (DisplayManager.MouseInTargetDisplay
37+
&& (InputManager.GetMouseButtonDown(0) || InputManager.GetMouseButtonDown(1)))
3738
{
3839
int count = UIManager.PanelHolder.transform.childCount;
3940
var mousePos = DisplayManager.MousePosition;

0 commit comments

Comments
 (0)