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

Make QTabBar.setTabButton() accept null

Browse Source
This commit is contained in:
Simon Edwards 2022-04-16 21:49:08 +02:00
parent 4c5ccadfc7
commit 7d8fb77481
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cpp/lib/QtWidgets/QTabBar/qtabbar_wrap.cpp
View File

@ -169,12 +169,18 @@ Napi::Value QTabBarWrap::setTabButton(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
int index = info[0].As<Napi::Number>().Int32Value();
int position = info[1].As<Napi::Number>().Int32Value();
Napi::Object widgetObject = info[2].As<Napi::Object>();
NodeWidgetWrap* widgetWrap =
Napi::ObjectWrap<NodeWidgetWrap>::Unwrap(widgetObject);
this->instance->setTabButton(index,
static_cast<QTabBar::ButtonPosition>(position),
widgetWrap->getInternalInstance());
if (info[2].IsNull()) {
this->instance->setTabButton(
index, static_cast<QTabBar::ButtonPosition>(position), nullptr);
} else {
Napi::Object widgetObject = info[2].As<Napi::Object>();
NodeWidgetWrap* widgetWrap =
Napi::ObjectWrap<NodeWidgetWrap>::Unwrap(widgetObject);
this->instance->setTabButton(index,
static_cast<QTabBar::ButtonPosition>(position),
widgetWrap->getInternalInstance());
}
return env.Null();
}

6
src/lib/QtWidgets/QTabBar.ts
View File

@ -10,7 +10,7 @@ import { QPoint } from '../QtCore/QPoint';
import { QRect } from '../QtCore/QRect';
/**
> Create and control tabbar.
* **This class is a JS wrapper around Qt's [QTabBar class](https://doc.qt.io/qt-5/qtabbar.html)**
@ -155,8 +155,8 @@ export class QTabBar extends NodeWidget<QTabBarSignals> {
removeTab(index: number): void {
this.native.removeTab(index);
}
setTabButton(index: number, position: ButtonPosition, widget: NodeWidget<any>): void {
this.native.setTabButton(index, position, widget.native);
setTabButton(index: number, position: ButtonPosition, widget: NodeWidget<any> | undefined | null): void {
this.native.setTabButton(index, position, widget == null ? null : widget?.native);
}
setTabData(index: number, data: QVariant): void {
this.native.setTabData(index, data.native);