From 5fccc207f74615ec7818ca57779e4d833e0ed1a9 Mon Sep 17 00:00:00 2001 From: Atul R Date: Sun, 9 Jun 2019 08:08:03 +0200 Subject: [PATCH] Adds Yoga props to all widgets --- demo.ts | 1 - package.json | 10 ++++++---- src/cpp/QtGui/QWidget/qwidget_macro.h | 1 - src/cpp/QtGui/QWidget/qwidget_wrap.h | 2 +- src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp | 1 + src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h | 2 ++ src/cpp/QtWidgets/QLabel/qlabel_wrap.h | 3 ++- src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp | 1 + src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h | 3 +++ src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp | 1 + src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h | 2 ++ src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp | 1 + src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h | 2 ++ src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp | 1 + src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h | 3 +++ src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp | 1 + src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h | 3 +++ 17 files changed, 30 insertions(+), 8 deletions(-) diff --git a/demo.ts b/demo.ts index 16929a486..3d2cbe578 100644 --- a/demo.ts +++ b/demo.ts @@ -64,7 +64,6 @@ const testGridLayout = () => { // ----------------------------------------------- -// Doesnt work as of now. Testing flex here. const testFlexLayout = () => { const win = new QMainWindow(); const view = new QWidget(); diff --git a/package.json b/package.json index 31afd66d1..e48562c33 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,13 @@ "typescript": "^3.4.5" }, "scripts": { + "build:lib": "tsc", "build:addon": "node-gyp -j 8 build", - "rebuild:addon": "node-gyp -j 8 build", - "build:lib": "rm -rf ./dist/ && tsc", - "dev": "yarn build:lib && qode dist/demo.js", - "automoc": "node ./scripts/automoc.js" + "rebuild:addon": "node-gyp -j 8 rebuild", + "clean": "rm -rf ./dist ./build", + "automoc": "node ./scripts/automoc.js", + "dev": "tsc && qode dist/demo.js", + "demo": "tsc && qode dist/examples/calculator/index.js" }, "dependencies": { "bindings": "^1.5.0", diff --git a/src/cpp/QtGui/QWidget/qwidget_macro.h b/src/cpp/QtGui/QWidget/qwidget_macro.h index 50de0d723..ab0307429 100644 --- a/src/cpp/QtGui/QWidget/qwidget_macro.h +++ b/src/cpp/QtGui/QWidget/qwidget_macro.h @@ -62,7 +62,6 @@ Napi::Value hide(const Napi::CallbackInfo& info) { \ #endif //QWIDGET_WRAPPED_METHODS_DECLARATION - #ifndef QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE #define QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(WidgetWrapName) \ \ diff --git a/src/cpp/QtGui/QWidget/qwidget_wrap.h b/src/cpp/QtGui/QWidget/qwidget_wrap.h index b0758afac..7b61a83ed 100644 --- a/src/cpp/QtGui/QWidget/qwidget_wrap.h +++ b/src/cpp/QtGui/QWidget/qwidget_wrap.h @@ -1,6 +1,6 @@ #pragma once -#include "qwidget_macro.h" +#include "src/cpp/QtGui/QWidget/qwidget_macro.h" #include "src/cpp/core/YogaWidget/yogawidget_macro.h" #include #include "nwidget.h" diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp index 3da499871..b20e8e61d 100644 --- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp +++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp @@ -12,6 +12,7 @@ Napi::Object QCheckBoxWrap::init(Napi::Env env, Napi::Object exports) { Napi::Function func = DefineClass(env, CLASSNAME, { InstanceMethod("setText", &QCheckBoxWrap::setText), QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QCheckBoxWrap) + QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QCheckBoxWrap) }); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h index e0c7e516e..826618334 100644 --- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h +++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h @@ -3,6 +3,7 @@ #include #include "ncheckbox.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" +#include "src/cpp/core/YogaWidget/yogawidget_macro.h" class QCheckBoxWrap : public Napi::ObjectWrap{ private: @@ -18,5 +19,6 @@ class QCheckBoxWrap : public Napi::ObjectWrap{ Napi::Value setText(const Napi::CallbackInfo& info); QWIDGET_WRAPPED_METHODS_DECLARATION + YOGAWIDGET_WRAPPED_METHODS_DECLARATION }; diff --git a/src/cpp/QtWidgets/QLabel/qlabel_wrap.h b/src/cpp/QtWidgets/QLabel/qlabel_wrap.h index 949f10bf1..93387ca89 100644 --- a/src/cpp/QtWidgets/QLabel/qlabel_wrap.h +++ b/src/cpp/QtWidgets/QLabel/qlabel_wrap.h @@ -21,6 +21,7 @@ class QLabelWrap : public Napi::ObjectWrap{ Napi::Value text(const Napi::CallbackInfo &info); QWIDGET_WRAPPED_METHODS_DECLARATION - YOGAWIDGET_WRAPPED_METHODS_DECLARATION +YOGAWIDGET_WRAPPED_METHODS_DECLARATION + }; diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp index 3beabfc10..7d21a6032 100644 --- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp +++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp @@ -12,6 +12,7 @@ Napi::Object QLineEditWrap::init(Napi::Env env, Napi::Object exports) { char CLASSNAME[] = "QLineEdit"; Napi::Function func = DefineClass(env, CLASSNAME, { QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QLineEditWrap) + YOGAWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QLineEditWrap) }); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h index 408cbe48c..abb3e5257 100644 --- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h +++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h @@ -3,6 +3,7 @@ #include #include "nlineedit.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" +#include "src/cpp/core/YogaWidget/yogawidget_macro.h" class QLineEditWrap : public Napi::ObjectWrap{ private: @@ -17,5 +18,7 @@ class QLineEditWrap : public Napi::ObjectWrap{ //wrapped methods QWIDGET_WRAPPED_METHODS_DECLARATION + YOGAWIDGET_WRAPPED_METHODS_DECLARATION + }; diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp index 2b277e6da..65e5a5a9f 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp @@ -9,6 +9,7 @@ Napi::Object QMainWindowWrap::init(Napi::Env env, Napi::Object exports) { char CLASSNAME[] = "QMainWindow"; Napi::Function func = DefineClass(env, CLASSNAME, { QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QMainWindowWrap) + YOGAWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QMainWindowWrap) InstanceMethod("setCentralWidget",&QMainWindowWrap::setCentralWidget), }); constructor = Napi::Persistent(func); diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h index f8e37cced..be6c176a8 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h @@ -3,6 +3,7 @@ #include #include "nmainwindow.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" +#include "src/cpp/core/YogaWidget/yogawidget_macro.h" class QMainWindowWrap : public Napi::ObjectWrap{ private: @@ -19,5 +20,6 @@ public: Napi::Value setCentralWidget(const Napi::CallbackInfo& info); QWIDGET_WRAPPED_METHODS_DECLARATION + YOGAWIDGET_WRAPPED_METHODS_DECLARATION }; diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp index 3f7b51085..2a40d328e 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp @@ -12,6 +12,7 @@ Napi::Object QProgressBarWrap::init(Napi::Env env, Napi::Object exports) { char CLASSNAME[] = "QProgressBar"; Napi::Function func = DefineClass(env, CLASSNAME, { QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QProgressBarWrap) + YOGAWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QProgressBarWrap) }); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h index 8fb6f02f9..ce896bcc4 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h @@ -3,6 +3,7 @@ #include #include "nprogressbar.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" +#include "src/cpp/core/YogaWidget/yogawidget_macro.h" class QProgressBarWrap : public Napi::ObjectWrap{ private: @@ -17,6 +18,7 @@ class QProgressBarWrap : public Napi::ObjectWrap{ //wrapped methods QWIDGET_WRAPPED_METHODS_DECLARATION + YOGAWIDGET_WRAPPED_METHODS_DECLARATION }; diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp index 1dd7e5136..316bb0b75 100644 --- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp +++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp @@ -11,6 +11,7 @@ Napi::Object QPushButtonWrap::init(Napi::Env env, Napi::Object exports) { InstanceMethod("setText", &QPushButtonWrap::setText), InstanceMethod("setupSignalListeners",&QPushButtonWrap::setupSignalListeners), QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QPushButtonWrap) + YOGAWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QPushButtonWrap) }); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h index f906daa1a..d0b21541f 100644 --- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h +++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h @@ -4,6 +4,7 @@ #include #include "npushbutton.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" +#include "src/cpp/core/YogaWidget/yogawidget_macro.h" class QPushButtonWrap : public Napi::ObjectWrap { private: @@ -21,6 +22,8 @@ class QPushButtonWrap : public Napi::ObjectWrap { Napi::Value setText(const Napi::CallbackInfo& info); QWIDGET_WRAPPED_METHODS_DECLARATION + YOGAWIDGET_WRAPPED_METHODS_DECLARATION + }; diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp index 0baf63c83..aba7b516f 100644 --- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp +++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp @@ -12,6 +12,7 @@ Napi::Object QRadioButtonWrap::init(Napi::Env env, Napi::Object exports) { char CLASSNAME[] = "QRadioButton"; Napi::Function func = DefineClass(env, CLASSNAME, { QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QRadioButtonWrap) + YOGAWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QRadioButtonWrap) }); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h index e9414a9fd..c69260d75 100644 --- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h +++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h @@ -3,6 +3,7 @@ #include #include "nradiobutton.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" +#include "src/cpp/core/YogaWidget/yogawidget_macro.h" class QRadioButtonWrap : public Napi::ObjectWrap{ private: @@ -17,6 +18,8 @@ class QRadioButtonWrap : public Napi::ObjectWrap{ //wrapped methods QWIDGET_WRAPPED_METHODS_DECLARATION + YOGAWIDGET_WRAPPED_METHODS_DECLARATION + }; \ No newline at end of file