Skip to content

FIX: Re fix/add QTableWidget features #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sedwards2009 merged 2 commits into from
Mar 3, 2024
Merged

FIX: Re fix/add QTableWidget features #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53203bf
Re-add emoved row/column counts
NathanaelA Mar 2, 2024
301763f
Fix items not being registered
NathanaelA Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,9 @@ class DLL_EXPORT QTableWidgetWrap : public Napi::ObjectWrap<QTableWidgetWrap> {
Napi::Value visualColumn(const Napi::CallbackInfo& info);
Napi::Value visualItemRect(const Napi::CallbackInfo& info);
Napi::Value visualRow(const Napi::CallbackInfo& info);
Napi::Value columnCount(const Napi::CallbackInfo& info);
Napi::Value rowCount(const Napi::CallbackInfo& info);
Napi::Value setColumnCount(const Napi::CallbackInfo& info);
Napi::Value setRowCount(const Napi::CallbackInfo& info);

};
48 changes: 48 additions & 0 deletions src/cpp/lib/QtWidgets/QTableWidget/qtablewidget_wrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,27 @@ Napi::Object QTableWidgetWrap::init(Napi::Env env, Napi::Object exports) {
InstanceMethod("insertRow", &QTableWidgetWrap::insertRow),
InstanceMethod("removeRow", &QTableWidgetWrap::removeRow),
InstanceMethod("scrollToItem", &QTableWidgetWrap::scrollToItem),
InstanceMethod("cellWidget", &QTableWidgetWrap::cellWidget),
InstanceMethod("column", &QTableWidgetWrap::column),
InstanceMethod("row", &QTableWidgetWrap::row),
InstanceMethod("currentColumn", &QTableWidgetWrap::currentColumn),
InstanceMethod("currentItem", &QTableWidgetWrap::currentItem),
InstanceMethod("currentRow", &QTableWidgetWrap::currentRow),
InstanceMethod("findItems", &QTableWidgetWrap::findItems),
InstanceMethod("item", &QTableWidgetWrap::item),
InstanceMethod("itemAt", &QTableWidgetWrap::itemAt),
InstanceMethod("removeCellWidget", &QTableWidgetWrap::removeCellWidget),
InstanceMethod("setCurrentCell", &QTableWidgetWrap::setCurrentCell),
InstanceMethod("setCurrentItem", &QTableWidgetWrap::setCurrentItem),
InstanceMethod("sortItems", &QTableWidgetWrap::sortItems),
InstanceMethod("takeItem", &QTableWidgetWrap::takeItem),
InstanceMethod("visualColumn", &QTableWidgetWrap::visualColumn),
InstanceMethod("visualItemRect", &QTableWidgetWrap::visualItemRect),
InstanceMethod("visualRow", &QTableWidgetWrap::visualRow),
InstanceMethod("columnCount", &QTableWidgetWrap::columnCount),
InstanceMethod("rowCount", &QTableWidgetWrap::rowCount),
InstanceMethod("setColumnCount", &QTableWidgetWrap::setColumnCount),
InstanceMethod("setRowCount", &QTableWidgetWrap::setRowCount),
Copy link
Copy Markdown
Collaborator

@sedwards2009 sedwards2009 Mar 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we have a whole bunch of code in there which just was never hooked up to the nodejs wrapper?

Copy link
Copy Markdown
Contributor Author

@NathanaelA NathanaelA Mar 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I added the 4 actual missing functions that everything got somehow removed, and then re-wired the 15 or so missing InstanceMethod that should have been tied to code that still existed in both the C/H & TS files -- but somehow lost the InstanceMethods. So that code was failing from the TS/JS side since they weren't actually wired up...

Copy link
Copy Markdown
Contributor Author

@NathanaelA NathanaelA Mar 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should probably also mention the existing code still works and was originally from one of my prior PR's. It was hooked up before the refactoring, as I've been using several of those functions with QT 5. I finally upgraded the library to the current version and found all the broken issues.

My program seems to now be working again with the changes I've made into this PR.

InstanceMethod(
"isPersistentEditorOpen_qtablewidgetitem",
&QTableWidgetWrap::isPersistentEditorOpen_qtablewidgetitem),
Expand Down Expand Up @@ -451,3 +472,30 @@ Napi::Value QTableWidgetWrap::visualRow(const Napi::CallbackInfo& info) {
int row = this->instance->visualRow(logicalRow);
return Napi::Number::New(env, row);
}

Napi::Value QTableWidgetWrap::columnCount(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
int count = static_cast<int>(this->instance->columnCount());
return Napi::Number::New(env, count);
}

Napi::Value QTableWidgetWrap::rowCount(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
int count = static_cast<int>(this->instance->rowCount());
return Napi::Number::New(env, count);
}

Napi::Value QTableWidgetWrap::setColumnCount(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
int count = info[0].As<Napi::Number>().Int32Value();
this->instance->setColumnCount(count);
return env.Null();
}

Napi::Value QTableWidgetWrap::setRowCount(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
int count = info[0].As<Napi::Number>().Int32Value();
this->instance->setRowCount(count);
return env.Null();
}

12 changes: 12 additions & 0 deletions src/lib/QtWidgets/QTableWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,18 @@ export class QTableWidget extends QTableView<QTableWidgetSignals> {
visualRow(logicalRow = 0): number {
return this.native.visualColumn(logicalRow);
}
columnCount(): number {
return this.native.columnCount();
}
rowCount(): number {
return this.native.rowCount();
}
setColumnCount(count: number): void {
this.native.setColumnCount(count);
}
setRowCount(count: number): void {
this.native.setRowCount(count);
}
}
wrapperCache.registerWrapper('QTableWidgetWrap', QTableWidget);

Expand Down