plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue #439 (#440)

Browse Source 
Co-authored-by: wuxiaofeng <wuxiaofeng@erayt.com>
This commit is contained in:
feng8848 2020-03-12 23:21:56 +08:00 committed by GitHub
parent 8e574ba33d
commit 2359ca8838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h
View File

@ -10,6 +10,7 @@
#include "QtWidgets/QListWidget/nlistwidget.hpp"
class DLL_EXPORT QListWidgetWrap : public Napi::ObjectWrap<QListWidgetWrap> {
QListView_WRAPPED_METHODS_DECLARATION
private:
QPointer<NListWidget> instance;
@ -42,6 +43,4 @@ class DLL_EXPORT QListWidgetWrap : public Napi::ObjectWrap<QListWidgetWrap> {
Napi::Value visualItemRect(const Napi::CallbackInfo& info);
Napi::Value clear(const Napi::CallbackInfo& info);
Napi::Value scrollToItem(const Napi::CallbackInfo& info);
QListView_WRAPPED_METHODS_DECLARATION
};

1
src/cpp/include/nodegui/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h
View File

@ -10,6 +10,7 @@ class DLL_EXPORT QListWidgetItemWrap
: public Napi::ObjectWrap<QListWidgetItemWrap> {
private:
QListWidgetItem* instance;
bool disableDeletion;
public:
static Napi::Object init(Napi::Env env, Napi::Object exports);

14
src/cpp/lib/QtCore/QModelIndex/qmodelindex_wrap.cpp
View File

@ -33,11 +33,17 @@ QModelIndexWrap::QModelIndexWrap(const Napi::CallbackInfo& info)
Napi::Env env = info.Env();
Napi::HandleScope scope(env);
if (info.Length() == 0) {
this->instance = std::make_unique<QModelIndex>();
if (info.Length() > 0 && info[0].IsExternal()) {
// --- if external ---
this->instance = std::unique_ptr<QModelIndex>(
info[0].As<Napi::External<QModelIndex>>().Data());
} else {
Napi::TypeError::New(env, "Wrong number of arguments")
.ThrowAsJavaScriptException();
if (info.Length() == 0) {
this->instance = std::make_unique<QModelIndex>();
} else {
Napi::TypeError::New(env, "Wrong number of arguments")
.ThrowAsJavaScriptException();
}
}
this->rawData = extrautils::configureComponent(this->getInternalInstance());
}

32
src/cpp/lib/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.cpp
View File

@ -46,22 +46,36 @@ Napi::Object QListWidgetItemWrap::init(Napi::Env env, Napi::Object exports) {
QListWidgetItem* QListWidgetItemWrap::getInternalInstance() {
return this->instance;
}
QListWidgetItemWrap::~QListWidgetItemWrap() { delete this->instance; }
QListWidgetItemWrap::~QListWidgetItemWrap() {
if (!this->disableDeletion) {
delete this->instance;
}
}
QListWidgetItemWrap::QListWidgetItemWrap(const Napi::CallbackInfo& info)
: Napi::ObjectWrap<QListWidgetItemWrap>(info) {
Napi::Env env = info.Env();
Napi::HandleScope scope(env);
if (info.Length() == 1) {
QString text =
QString::fromUtf8(info[0].As<Napi::String>().Utf8Value().c_str());
this->instance = new QListWidgetItem(text);
} else if (info.Length() == 0) {
this->instance = new QListWidgetItem();
if (info.Length() > 0 && info[0].IsExternal()) {
// --- if external ---
this->instance = info[0].As<Napi::External<QListWidgetItem>>().Data();
if (info.Length() == 2) {
this->disableDeletion = info[1].As<Napi::Boolean>().Value();
}
} else {
Napi::TypeError::New(env, "Wrong number of arguments")
.ThrowAsJavaScriptException();
// --- regular cases ---
if (info.Length() == 1) {
QString text =
QString::fromUtf8(info[0].As<Napi::String>().Utf8Value().c_str());
this->instance = new QListWidgetItem(text);
} else if (info.Length() == 0) {
this->instance = new QListWidgetItem();
} else {
Napi::TypeError::New(env, "Wrong number of arguments")
.ThrowAsJavaScriptException();
}
}
this->rawData = extrautils::configureComponent(this->getInternalInstance());
}