Disable edtiro scrolling/mouse actions when mouse is over UI.

MStachowicz · MStachowicz · commit e9052555f37a · 2024-03-16T15:28:05.000Z
diff --git a/source/UI/Editor.cpp b/source/UI/Editor.cpp
@@ -128,6 +128,9 @@ namespace UI
 
 	void Editor::on_mouse_move_event(const glm::vec2 p_mouse_delta)
 	{
+		if (m_input.cursor_over_UI())
+			return;
+
 		if (m_state == State::Editing)
 		{
 			if (m_input.is_mouse_down(Platform::MouseButton::Right))
@@ -147,6 +150,9 @@ namespace UI
 	}
 	void Editor::on_mouse_scroll_event(const glm::vec2 p_mouse_scroll)
 	{
+		if (m_input.cursor_over_UI())
+			return;
+
 		if (m_state == State::Editing)
 		{
 			m_camera.zoom(p_mouse_scroll.y);

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,9 @@ namespace UI`
`128`	`128`
`129`	`129`	`void Editor::on_mouse_move_event(const glm::vec2 p_mouse_delta)`
`130`	`130`	`{`
	`131`	`+ if (m_input.cursor_over_UI())`
	`132`	`+ return;`
	`133`	`+`
`131`	`134`	`if (m_state == State::Editing)`
`132`	`135`	`{`
`133`	`136`	`if (m_input.is_mouse_down(Platform::MouseButton::Right))`
`@@ -147,6 +150,9 @@ namespace UI`
`147`	`150`	`}`
`148`	`151`	`void Editor::on_mouse_scroll_event(const glm::vec2 p_mouse_scroll)`
`149`	`152`	`{`
	`153`	`+ if (m_input.cursor_over_UI())`
	`154`	`+ return;`
	`155`	`+`
`150`	`156`	`if (m_state == State::Editing)`
`151`	`157`	`{`
`152`	`158`	`m_camera.zoom(p_mouse_scroll.y);`