Fix bugs

sedwards2009 · sedwards2009 · commit 8cf83ec0575b · 2024-10-08T20:53:55.000+02:00
diff --git a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h
@@ -40,5 +40,5 @@ DLL_EXPORT Napi::Value fromHslF(const Napi::CallbackInfo& info);
 DLL_EXPORT Napi::Value fromHsv(const Napi::CallbackInfo& info);
 DLL_EXPORT Napi::Value fromHsvF(const Napi::CallbackInfo& info);
 DLL_EXPORT Napi::Value fromRgb(const Napi::CallbackInfo& info);
-DLL_EXPORT Napi::Value fromRgb(const Napi::CallbackInfo& info);
+DLL_EXPORT Napi::Value fromRgbF(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
@@ -28,7 +28,7 @@ Napi::Object QColorWrap::init(Napi::Env env, Napi::Object exports) {
        StaticMethod("fromHsv", &StaticQColorWrapMethods::fromHsv),
        StaticMethod("fromHsvF", &StaticQColorWrapMethods::fromHsvF),
        StaticMethod("fromRgb", &StaticQColorWrapMethods::fromRgb),
-       StaticMethod("fromRgb", &StaticQColorWrapMethods::fromRgb),
+       StaticMethod("fromRgbF", &StaticQColorWrapMethods::fromRgbF),
        COMPONENT_WRAPPED_METHODS_EXPORT_DEFINE(QColorWrap)});
   constructor = Napi::Persistent(func);
   exports.Set(CLASSNAME, func);
@@ -222,3 +222,15 @@ Napi::Value StaticQColorWrapMethods::fromRgb(const Napi::CallbackInfo& info) {
       {Napi::External<QColor>::New(env, new QColor(color))});
   return instance;
 }
+
+Napi::Value StaticQColorWrapMethods::fromRgbF(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  float r = info[0].As<Napi::Number>().FloatValue();
+  float g = info[1].As<Napi::Number>().FloatValue();
+  float b = info[2].As<Napi::Number>().FloatValue();
+  float a = info[3].As<Napi::Number>().FloatValue();
+  QColor color = QColor::fromRgbF(r, g, b, a);
+  auto instance = QColorWrap::constructor.New(
+      {Napi::External<QColor>::New(env, new QColor(color))});
+  return instance;
+}
diff --git a/src/lib/QtGui/QColor.ts b/src/lib/QtGui/QColor.ts
@@ -86,6 +86,9 @@ export class QColor extends Component {
     static fromRgb(r: number, g: number, b: number, a = 255): QColor {
         return new QColor(addon.QColor.fromRgb(r, g, b, a));
     }
+    static fromRgbF(r: number, g: number, b: number, a = 1.0): QColor {
+        return new QColor(addon.QColor.fromRgbF(r, g, b, a));
+    }
     static fromQVariant(variant: QVariant): QColor {
         return new QColor(addon.QColor.fromQVariant(variant.native));
     }

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ export class QColor extends Component {`
`86`	`86`	`static fromRgb(r: number, g: number, b: number, a = 255): QColor {`
`87`	`87`	`return new QColor(addon.QColor.fromRgb(r, g, b, a));`
`88`	`88`	`}`
	`89`	`+ static fromRgbF(r: number, g: number, b: number, a = 1.0): QColor {`
	`90`	`+ return new QColor(addon.QColor.fromRgbF(r, g, b, a));`
	`91`	`+ }`
`89`	`92`	`static fromQVariant(variant: QVariant): QColor {`
`90`	`93`	`return new QColor(addon.QColor.fromQVariant(variant.native));`
`91`	`94`	`}`