[Scripting] fix Screen constructor

LatiteClient · Nov 30, 2024 · 2703c13 · 2703c13
1 parent 5581fe4
commit 2703c13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/client/screen/script/JsScreen.cpp b/src/client/screen/script/JsScreen.cpp
@@ -5,7 +5,7 @@
 #include "sdk/common/client/gui/controls/VisualTree.h"
 #include "sdk/common/client/gui/controls/UIControl.h"
 
-JsScreen::JsScreen(JsValueRef object, JsValueRef renderFunc) : renderFunc(renderFunc) {
+JsScreen::JsScreen(JsValueRef object, std::string name) : name(std::move(name)) {
 	JS::JsGetCurrentContext(&this->ctx);
 
 	Chakra::GetStringProperty(object, L"name");

diff --git a/src/client/screen/script/JsScreen.h b/src/client/screen/script/JsScreen.h
@@ -11,7 +11,7 @@
 
 class JsScreen : public Screen, public JsEvented {
 public:
-	JsScreen(JsValueRef object, JsValueRef renderFunc);
+	JsScreen(JsValueRef object, std::string name);
 
 	void onRender(class ::Event& ev);
 	void onKey(::Event& ev);
@@ -25,7 +25,6 @@ class JsScreen : public Screen, public JsEvented {
 	void onDisable() override;
 private:
 	JsValueRef object = JS_INVALID_REFERENCE;
-	JsValueRef renderFunc = JS_INVALID_REFERENCE;
 	JsContextRef ctx = JS_INVALID_REFERENCE;
 
 	std::string name;

diff --git a/src/client/script/class/impl/JsScreenClass.h b/src/client/script/class/impl/JsScreenClass.h
@@ -8,10 +8,10 @@ class JsScreenClass : public JsWrapperClass<JsScreen> {
 	static JsValueRef CALLBACK jsConstructor(JsValueRef callee, bool isConstructor,
 		JsValueRef* arguments, unsigned short argCount, void* callbackState) {
 		auto thi = reinterpret_cast<JsScreenClass*>(callbackState);
-		if (!Chakra::VerifyArgCount(argCount, 2)) return JS_INVALID_REFERENCE;
-		if (!Chakra::VerifyParameters({ {arguments[1], JsString}, {arguments[2], JsFunction} })) return JS_INVALID_REFERENCE;
+		if (!Chakra::VerifyArgCount(argCount, 1)) return JS_INVALID_REFERENCE;
+		if (!Chakra::VerifyParameters({ {arguments[1], JsString} })) return JS_INVALID_REFERENCE;
 
-		auto screen = new JsScreen(arguments[0], arguments[2]);
+		auto screen = new JsScreen(arguments[0], util::WStrToStr(Chakra::GetString(arguments[1])));
 		JsValueRef obj = thi->construct(screen, false);
 		return obj;
 	}