Adds Yoga props to all widgets
This commit is contained in:
parent
361acd76a8
commit
5fccc207f7
1
demo.ts
1
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();
|
||||
|
||||
10
package.json
10
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",
|
||||
|
||||
@ -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) \
|
||||
\
|
||||
|
||||
@ -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 <napi.h>
|
||||
#include "nwidget.h"
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include <napi.h>
|
||||
#include "ncheckbox.h"
|
||||
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
|
||||
#include "src/cpp/core/YogaWidget/yogawidget_macro.h"
|
||||
|
||||
class QCheckBoxWrap : public Napi::ObjectWrap<QCheckBoxWrap>{
|
||||
private:
|
||||
@ -18,5 +19,6 @@ class QCheckBoxWrap : public Napi::ObjectWrap<QCheckBoxWrap>{
|
||||
Napi::Value setText(const Napi::CallbackInfo& info);
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
};
|
||||
|
||||
|
||||
@ -21,6 +21,7 @@ class QLabelWrap : public Napi::ObjectWrap<QLabelWrap>{
|
||||
Napi::Value text(const Napi::CallbackInfo &info);
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include <napi.h>
|
||||
#include "nlineedit.h"
|
||||
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
|
||||
#include "src/cpp/core/YogaWidget/yogawidget_macro.h"
|
||||
|
||||
class QLineEditWrap : public Napi::ObjectWrap<QLineEditWrap>{
|
||||
private:
|
||||
@ -17,5 +18,7 @@ class QLineEditWrap : public Napi::ObjectWrap<QLineEditWrap>{
|
||||
//wrapped methods
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include <napi.h>
|
||||
#include "nmainwindow.h"
|
||||
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
|
||||
#include "src/cpp/core/YogaWidget/yogawidget_macro.h"
|
||||
|
||||
class QMainWindowWrap : public Napi::ObjectWrap<QMainWindowWrap>{
|
||||
private:
|
||||
@ -19,5 +20,6 @@ public:
|
||||
Napi::Value setCentralWidget(const Napi::CallbackInfo& info);
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
};
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include <napi.h>
|
||||
#include "nprogressbar.h"
|
||||
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
|
||||
#include "src/cpp/core/YogaWidget/yogawidget_macro.h"
|
||||
|
||||
class QProgressBarWrap : public Napi::ObjectWrap<QProgressBarWrap>{
|
||||
private:
|
||||
@ -17,6 +18,7 @@ class QProgressBarWrap : public Napi::ObjectWrap<QProgressBarWrap>{
|
||||
//wrapped methods
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
#include <napi-thread-safe-callback.hpp>
|
||||
#include "npushbutton.h"
|
||||
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
|
||||
#include "src/cpp/core/YogaWidget/yogawidget_macro.h"
|
||||
|
||||
class QPushButtonWrap : public Napi::ObjectWrap<QPushButtonWrap> {
|
||||
private:
|
||||
@ -21,6 +22,8 @@ class QPushButtonWrap : public Napi::ObjectWrap<QPushButtonWrap> {
|
||||
Napi::Value setText(const Napi::CallbackInfo& info);
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
#include <napi.h>
|
||||
#include "nradiobutton.h"
|
||||
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
|
||||
#include "src/cpp/core/YogaWidget/yogawidget_macro.h"
|
||||
|
||||
class QRadioButtonWrap : public Napi::ObjectWrap<QRadioButtonWrap>{
|
||||
private:
|
||||
@ -17,6 +18,8 @@ class QRadioButtonWrap : public Napi::ObjectWrap<QRadioButtonWrap>{
|
||||
//wrapped methods
|
||||
|
||||
QWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
YOGAWIDGET_WRAPPED_METHODS_DECLARATION
|
||||
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user