From 22178c074a8d2eb2fd3cf9880d741a239a44c2d1 Mon Sep 17 00:00:00 2001 From: Atul R Date: Sun, 14 Jul 2019 13:00:47 +0200 Subject: [PATCH] maxSize,minSize,repaint,update --- src/cpp/QtGui/QWidget/qwidget_macro.h | 44 ++++++++++++++++++- .../QMainWindow/qmainwindow_wrap.cpp | 11 ----- .../QtWidgets/QMainWindow/qmainwindow_wrap.h | 1 - src/lib/QtGui/QWidget/index.ts | 15 +++++++ src/lib/QtWidgets/QMainWindow/index.ts | 9 +--- 5 files changed, 59 insertions(+), 21 deletions(-) diff --git a/src/cpp/QtGui/QWidget/qwidget_macro.h b/src/cpp/QtGui/QWidget/qwidget_macro.h index fd6322204..a8a8405a9 100644 --- a/src/cpp/QtGui/QWidget/qwidget_macro.h +++ b/src/cpp/QtGui/QWidget/qwidget_macro.h @@ -84,6 +84,44 @@ Napi::Value setEnabled(const Napi::CallbackInfo& info){ \ this->instance->setEnabled(enabled.Value()); \ return env.Null(); \ } \ +Napi::Value setFixedSize(const Napi::CallbackInfo& info){ \ + Napi::Env env = info.Env(); \ + Napi::HandleScope scope(env); \ + int width = info[0].As().Int32Value(); \ + int height = info[1].As().Int32Value(); \ + this->instance->setFixedSize(width, height); \ + return env.Null(); \ +} \ +Napi::Value setMaximumSize(const Napi::CallbackInfo& info){ \ + Napi::Env env = info.Env(); \ + Napi::HandleScope scope(env); \ + int width = info[0].As().Int32Value(); \ + int height = info[1].As().Int32Value(); \ + this->instance->setMaximumSize(width, height); \ + return env.Null(); \ +} \ +Napi::Value setMinimumSize(const Napi::CallbackInfo& info){ \ + Napi::Env env = info.Env(); \ + Napi::HandleScope scope(env); \ + int width = info[0].As().Int32Value(); \ + int height = info[1].As().Int32Value(); \ + this->instance->setMinimumSize(width, height); \ + return env.Null(); \ +} \ +Napi::Value repaint(const Napi::CallbackInfo& info){ \ + Napi::Env env = info.Env(); \ + Napi::HandleScope scope(env); \ + this->instance->repaint(); \ + return env.Null(); \ +} \ +Napi::Value update(const Napi::CallbackInfo& info){ \ + Napi::Env env = info.Env(); \ + Napi::HandleScope scope(env); \ + this->instance->update(); \ + return env.Null(); \ +} \ + + #endif //QWIDGET_WRAPPED_METHODS_DECLARATION @@ -101,7 +139,11 @@ Napi::Value setEnabled(const Napi::CallbackInfo& info){ \ InstanceMethod("setObjectName",&WidgetWrapName::setObjectName), \ InstanceMethod("setMouseTracking",&WidgetWrapName::setMouseTracking), \ InstanceMethod("setEnabled",&WidgetWrapName::setEnabled), \ - + InstanceMethod("setFixedSize",&WidgetWrapName::setFixedSize), \ + InstanceMethod("setMaximumSize",&WidgetWrapName::setMaximumSize), \ + InstanceMethod("setMinimumSize",&WidgetWrapName::setMinimumSize), \ + InstanceMethod("repaint",&WidgetWrapName::repaint), \ + InstanceMethod("update",&WidgetWrapName::update), \ #endif // QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp index 608ca6d5f..bde248687 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp @@ -10,7 +10,6 @@ Napi::Object QMainWindowWrap::init(Napi::Env env, Napi::Object exports) { Napi::Function func = DefineClass(env, CLASSNAME, { QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QMainWindowWrap) InstanceMethod("setCentralWidget",&QMainWindowWrap::setCentralWidget), - InstanceMethod("setFixedSize",&QMainWindowWrap::setFixedSize), }); constructor = Napi::Persistent(func); exports.Set(CLASSNAME, func); @@ -60,13 +59,3 @@ Napi::Value QMainWindowWrap::setCentralWidget(const Napi::CallbackInfo& info){ return env.Null(); } -Napi::Value QMainWindowWrap::setFixedSize(const Napi::CallbackInfo& info){ - Napi::Env env = info.Env(); - Napi::HandleScope scope(env); - - int width = info[0].As().Int32Value(); - int height = info[1].As().Int32Value(); - this->instance->setFixedSize(width, height); - - return env.Null(); -} diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h index 6c9e64013..3cc4fba41 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h @@ -18,7 +18,6 @@ public: static Napi::FunctionReference constructor; //wrapped methods Napi::Value setCentralWidget(const Napi::CallbackInfo& info); - Napi::Value setFixedSize(const Napi::CallbackInfo& info); QWIDGET_WRAPPED_METHODS_DECLARATION }; diff --git a/src/lib/QtGui/QWidget/index.ts b/src/lib/QtGui/QWidget/index.ts index ddf4b7287..addf65bea 100644 --- a/src/lib/QtGui/QWidget/index.ts +++ b/src/lib/QtGui/QWidget/index.ts @@ -36,6 +36,21 @@ export abstract class NodeWidget extends EventWidget { setEnabled = (enabled: boolean) => { this.native.setEnabled(enabled); }; + setFixedSize = (width: number, height: number) => { + this.native.setFixedSize(width, height); + }; + setMaximumSize = (maxw: number, maxh: number) => { + this.native.setMaximumSize(maxw, maxh); + }; + setMinimumSize = (minw: number, minh: number) => { + this.native.setMinimumSize(minw, minh); + }; + repaint = () => { + this.native.repaint(); + }; + update = () => { + this.native.update(); + }; } export class QWidget extends NodeWidget { diff --git a/src/lib/QtWidgets/QMainWindow/index.ts b/src/lib/QtWidgets/QMainWindow/index.ts index ab3d26398..8c4b6ec51 100644 --- a/src/lib/QtWidgets/QMainWindow/index.ts +++ b/src/lib/QtWidgets/QMainWindow/index.ts @@ -22,7 +22,6 @@ export class QMainWindow extends NodeWidget { this.parent = parent; // bind member functions this.setCentralWidget.bind(this); - this.setFixedSize.bind(this); this.setLayout = (parentLayout: NodeLayout) => { if (this.centralWidget) { this.centralWidget.setLayout(parentLayout); @@ -33,11 +32,8 @@ export class QMainWindow extends NodeWidget { }; } setCentralWidget(widget: NodeWidget) { + this.native.setCentralWidget(widget.native, widget.getFlexNode()); this.centralWidget = widget; - this.native.setCentralWidget( - this.centralWidget.native, - widget.getFlexNode() - ); } get layout() { if (this.centralWidget) { @@ -46,7 +42,4 @@ export class QMainWindow extends NodeWidget { return super.layout; } } - setFixedSize(width: number, height: number) { - this.native.setFixedSize(width, height); - } }