diff --git a/demo.ts b/demo.ts index 6edfdc4f1..93e0757ef 100644 --- a/demo.ts +++ b/demo.ts @@ -29,6 +29,9 @@ button.setText("Push Push Push!"); button.setObjectName("btn"); const progressbar = new QProgressBar(); +progressbar.setValue(6); +progressbar.setMinimum(1); +progressbar.setMaximum(15); const radioButton = new QRadioButton(); radioButton.setText("Roger that!"); diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp index 24847938b..ed93cb3c1 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp @@ -11,6 +11,10 @@ Napi::Object QProgressBarWrap::init(Napi::Env env, Napi::Object exports) { Napi::HandleScope scope(env); char CLASSNAME[] = "QProgressBar"; Napi::Function func = DefineClass(env, CLASSNAME, { + InstanceMethod("setValue", &QProgressBarWrap::setValue), + InstanceMethod("setMaximum", &QProgressBarWrap::setMaximum), + InstanceMethod("setMinimum", &QProgressBarWrap::setMinimum), + InstanceMethod("value", &QProgressBarWrap::value), QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QProgressBarWrap) }); constructor = Napi::Persistent(func); @@ -43,3 +47,33 @@ QProgressBarWrap::~QProgressBarWrap() { delete this->instance; } +Napi::Value QProgressBarWrap::setValue(const Napi::CallbackInfo& info) { + Napi::Env env = info.Env(); + Napi::HandleScope scope(env); + Napi::Number value = info[0].As(); + this->instance->setValue(value.Int32Value()); + return env.Null(); +} + +Napi::Value QProgressBarWrap::setMaximum(const Napi::CallbackInfo& info) { + Napi::Env env = info.Env(); + Napi::HandleScope scope(env); + Napi::Number value = info[0].As(); + this->instance->setMaximum(value.Int32Value()); + return env.Null(); +} + +Napi::Value QProgressBarWrap::setMinimum(const Napi::CallbackInfo& info) { + Napi::Env env = info.Env(); + Napi::HandleScope scope(env); + Napi::Number value = info[0].As(); + this->instance->setMinimum(value.Int32Value()); + return env.Null(); +} + +Napi::Value QProgressBarWrap::value(const Napi::CallbackInfo& info) { + Napi::Env env = info.Env(); + Napi::HandleScope scope(env); + int value = this->instance->value(); + return Napi::Number::New(env, value); +} diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h index 8fb6f02f9..69f60eb4a 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h @@ -15,7 +15,11 @@ class QProgressBarWrap : public Napi::ObjectWrap{ //class constructor static Napi::FunctionReference constructor; //wrapped methods - + Napi::Value setValue(const Napi::CallbackInfo& info); + Napi::Value setMaximum(const Napi::CallbackInfo& info); + Napi::Value setMinimum(const Napi::CallbackInfo& info); + Napi::Value value(const Napi::CallbackInfo& info); + QWIDGET_WRAPPED_METHODS_DECLARATION }; diff --git a/src/lib/QtWidgets/QProgressBar/index.ts b/src/lib/QtWidgets/QProgressBar/index.ts index 1d5a15828..e879491ca 100644 --- a/src/lib/QtWidgets/QProgressBar/index.ts +++ b/src/lib/QtWidgets/QProgressBar/index.ts @@ -19,5 +19,21 @@ export class QProgressBar extends NodeWidget { this.native = native; this.parent = parent; // bind member functions + this.setValue.bind(this); + this.setMinimum.bind(this); + this.setMaximum.bind(this); + this.value.bind(this); + } + setValue(value: number) { + this.native.setValue(value); + } + setMinimum(min: number) { + this.native.setMinimum(min); + } + setMaximum(max: number) { + this.native.setMaximum(max); + } + value(): number { + return this.native.value(); } }