From f319a24ad3f1e8d526644bf6294f50127f0c6d0b Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Fri, 30 Jul 2021 09:04:30 +0200 Subject: [PATCH] Add `QColor.rgb()` and `QColor.rgba()` --- src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h | 2 ++ src/cpp/lib/QtGui/QColor/qcolor_wrap.cpp | 12 ++++++++++++ src/lib/QtGui/QColor.ts | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h index d6593a3a4..caea06ade 100644 --- a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h @@ -27,6 +27,8 @@ class DLL_EXPORT QColorWrap : public Napi::ObjectWrap { Napi::Value blue(const Napi::CallbackInfo& info); Napi::Value setAlpha(const Napi::CallbackInfo& info); Napi::Value alpha(const Napi::CallbackInfo& info); + Napi::Value rgb(const Napi::CallbackInfo& info); + Napi::Value rgba(const Napi::CallbackInfo& info); }; namespace StaticQColorWrapMethods { diff --git a/src/cpp/lib/QtGui/QColor/qcolor_wrap.cpp b/src/cpp/lib/QtGui/QColor/qcolor_wrap.cpp index cbdabb799..c3a53b453 100644 --- a/src/cpp/lib/QtGui/QColor/qcolor_wrap.cpp +++ b/src/cpp/lib/QtGui/QColor/qcolor_wrap.cpp @@ -18,6 +18,8 @@ Napi::Object QColorWrap::init(Napi::Env env, Napi::Object exports) { InstanceMethod("blue", &QColorWrap::blue), InstanceMethod("setAlpha", &QColorWrap::setAlpha), InstanceMethod("alpha", &QColorWrap::alpha), + InstanceMethod("rgb", &QColorWrap::rgb), + InstanceMethod("rgba", &QColorWrap::rgba), StaticMethod("fromQVariant", &StaticQColorWrapMethods::fromQVariant), COMPONENT_WRAPPED_METHODS_EXPORT_DEFINE(QColorWrap)}); constructor = Napi::Persistent(func); @@ -115,6 +117,16 @@ Napi::Value QColorWrap::alpha(const Napi::CallbackInfo& info) { Napi::HandleScope scope(env); return Napi::Value::From(env, this->instance->alpha()); } +Napi::Value QColorWrap::rgb(const Napi::CallbackInfo& info) { + Napi::Env env = info.Env(); + Napi::HandleScope scope(env); + return Napi::Value::From(env, this->instance->rgb()); +} +Napi::Value QColorWrap::rgba(const Napi::CallbackInfo& info) { + Napi::Env env = info.Env(); + Napi::HandleScope scope(env); + return Napi::Value::From(env, this->instance->rgba()); +} Napi::Value StaticQColorWrapMethods::fromQVariant( const Napi::CallbackInfo& info) { diff --git a/src/lib/QtGui/QColor.ts b/src/lib/QtGui/QColor.ts index bd18c21af..898bd23fc 100644 --- a/src/lib/QtGui/QColor.ts +++ b/src/lib/QtGui/QColor.ts @@ -52,6 +52,13 @@ export class QColor extends Component { alpha(): number { return this.native.alpha(); } + rgb(): number { + return this.native.rgb(); + } + rgba(): number { + return this.native.rgba(); + } + static fromQVariant(variant: QVariant): QColor { return new QColor(addon.QColor.fromQVariant(variant.native)); }