Update JsScreen.cpp

LatiteClient · Dec 1, 2024 · 0f0c129 · 0f0c129
1 parent 2703c13
commit 0f0c129
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/client/screen/script/JsScreen.cpp b/src/client/screen/script/JsScreen.cpp
@@ -19,7 +19,7 @@ JsScreen::JsScreen(JsValueRef object, std::string name) : name(std::move(name))
 	this->eventListeners[L"disable"] = {};
 	this->eventListeners[L"render"] = {};
 	this->eventListeners[L"key"] = {};
-	this->eventListeners[L"click"] = {};
+	this->eventListeners[L"mouse"] = {};
 }
 
 void JsScreen::onRender(::Event& evG) {
@@ -41,15 +41,17 @@ void JsScreen::onKey(::Event& evG) {
 	Event sEv{ L"key", {Chakra::MakeInt(ev.getKey()), ev.isDown() ? Chakra::GetTrue() : Chakra::GetFalse() }};
 	auto ret = dispatchEvent(sEv.name, sEv);
 	if (ret != JS_INVALID_REFERENCE) {
+		ev.setCancelled(Chakra::GetBool(ret));
 		Chakra::Release(ret);
 	}
 }
 
 void JsScreen::onClick(::Event& evG) {
 	auto& ev = reinterpret_cast<ClickEvent&>(evG);
-	Event sEv{ L"click", {Chakra::MakeInt(ev.getMouseButton()), Chakra::MakeInt(ev.getWheelDelta()), ev.isDown() ? Chakra::GetTrue() : Chakra::GetFalse() } };
+	Event sEv{ L"mouse", {Chakra::MakeInt(ev.getMouseButton()), Chakra::MakeInt(ev.getWheelDelta()), ev.isDown() ? Chakra::GetTrue() : Chakra::GetFalse() } };
 	auto ret = dispatchEvent(sEv.name, sEv);
 	if (ret != JS_INVALID_REFERENCE) {
+		ev.setCancelled(Chakra::GetBool(ret));
 		Chakra::Release(ret);
 	}
 }