Adjusting to new DasherCore and fixing the coordinate input

Sebastian Pape · Sebastian Pape · commit 5bc7533ac923 · 2024-09-04T17:09:00.000+02:00
diff --git a/DasherCore b/DasherCore
@@ -1 +1 @@
-Subproject commit 478d0df9ad69581256daf33a2b2627ef331b089c
+Subproject commit 4dcaae97a789bf9929daaf2725f950751efc8f34
diff --git a/src/DasherUIScreen.cpp b/src/DasherUIScreen.cpp
@@ -110,7 +110,7 @@ bool DasherUIScreen::SetCanvasSize(const ImVec2 position, const ImVec2 size)
 bool DasherUIScreen::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView)
 {
 	const ImVec2 MousePos = ImGui::GetMousePos();
-	if (MousePos.x < 0 || MousePos.y < 0) return false;
+	if(!ImGui::IsMousePosValid(&MousePos)) return false;
 	iX = static_cast<Dasher::screenint>(MousePos.x - CanvasPos.x);
 	iY = static_cast<Dasher::screenint>(MousePos.y - CanvasPos.y);
 	return true;

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ bool DasherUIScreen::SetCanvasSize(const ImVec2 position, const ImVec2 size)`
`110`	`110`	`bool DasherUIScreen::GetScreenCoords(Dasher::screenint& iX, Dasher::screenint& iY, Dasher::CDasherView* pView)`
`111`	`111`	`{`
`112`	`112`	`const ImVec2 MousePos = ImGui::GetMousePos();`
`113`		`- if (MousePos.x < 0 \|\| MousePos.y < 0) return false;`
	`113`	`+ if(!ImGui::IsMousePosValid(&MousePos)) return false;`
`114`	`114`	`iX = static_cast<Dasher::screenint>(MousePos.x - CanvasPos.x);`
`115`	`115`	`iY = static_cast<Dasher::screenint>(MousePos.y - CanvasPos.y);`
`116`	`116`	`return true;`