Fixes windows build for addon

This commit is contained in:
master-atul
2019-06-21 18:49:04 +02:00
parent d60c889288
commit 9f6ecc19dc
15 changed files with 35 additions and 31 deletions
@@ -1,4 +1,4 @@
#include "utils.h"
#include "nutils.h"
#include <string>
#include <QWidget>
#include "deps/spdlog/spdlog.h"
@@ -14,13 +14,17 @@ YGSize extrautils::measureQtWidget (YGNodeRef node, float width, YGMeasureMode w
if(ctx){
QLayoutItem* childLayoutItem = ctx->item;
QWidget* widget = childLayoutItem->widget();
float width = 0.0;
float height = 0.0;
if(widget){
QSize size = widget->sizeHint();
width = static_cast<float>(size.width());
height = static_cast<float>(size.height());
return YGSize{
.width = static_cast<float>(size.width()),
.height = static_cast<float>(size.height()),
width,
height,
};
}
}
return YGSize{ .width = 0, .height = 0};
return YGSize{width, height};
}
+1 -1
View File
@@ -1,6 +1,6 @@
#include "qwidget_wrap.h"
#include "src/cpp/QtWidgets/QLayout/qlayout_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QWidgetWrap::constructor;
@@ -1,6 +1,6 @@
#include "qcheckbox_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>
@@ -1,6 +1,6 @@
#include "qgridlayout_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QGridLayoutWrap::constructor;
+1 -1
View File
@@ -1,6 +1,6 @@
#include "qlabel_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include "src/cpp/core/FlexLayout/flexnode_wrap.h"
#include <QWidget>
@@ -1,7 +1,7 @@
#include "qlineedit_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>
@@ -1,6 +1,6 @@
#include "qmainwindow_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QMainWindowWrap::constructor;
@@ -1,7 +1,7 @@
#include "qprogressbar_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>
@@ -1,6 +1,6 @@
#include "qpushbutton_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
Napi::FunctionReference QPushButtonWrap::constructor;
@@ -4,7 +4,7 @@
#include "npushbutton.h"
#include "src/cpp/QtGui/QWidget/qwidget_macro.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
class QPushButtonWrap : public Napi::ObjectWrap<QPushButtonWrap> {
private:
@@ -1,7 +1,7 @@
#include "qradiobutton_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QWidget>
+1 -1
View File
@@ -1,7 +1,7 @@
#include "flexlayout_wrap.h"
#include "flexnode_wrap.h"
#include "src/cpp/QtGui/QWidget/qwidget_wrap.h"
#include "src/cpp/Extras/Utils/utils.h"
#include "src/cpp/Extras/Utils/nutils.h"
#include <QDebug>
Napi::FunctionReference FlexLayoutWrap::constructor;