From c499645797fbd9bade3fd61457df4518b622f574 Mon Sep 17 00:00:00 2001 From: Atul R Date: Sun, 22 Mar 2020 11:08:51 +0100 Subject: [PATCH] cleanup memory for scrollarea Adds basic format --- src/cpp/lib/QtWidgets/QScrollArea/qscrollarea_wrap.cpp | 5 ++++- src/lib/core/EventWidget.ts | 3 +-- website/docusaurus.config.js | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/cpp/lib/QtWidgets/QScrollArea/qscrollarea_wrap.cpp b/src/cpp/lib/QtWidgets/QScrollArea/qscrollarea_wrap.cpp index 765177c53..512df7b13 100644 --- a/src/cpp/lib/QtWidgets/QScrollArea/qscrollarea_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QScrollArea/qscrollarea_wrap.cpp @@ -23,7 +23,10 @@ Napi::Object QScrollAreaWrap::init(Napi::Env env, Napi::Object exports) { NScrollArea* QScrollAreaWrap::getInternalInstance() { return this->instance; } -QScrollAreaWrap::~QScrollAreaWrap() { extrautils::safeDelete(this->instance); } +QScrollAreaWrap::~QScrollAreaWrap() { + extrautils::safeDelete(this->instance); + YGNodeFree(this->scrollNode); +} QScrollAreaWrap::QScrollAreaWrap(const Napi::CallbackInfo& info) : Napi::ObjectWrap(info) { diff --git a/src/lib/core/EventWidget.ts b/src/lib/core/EventWidget.ts index cf32e693d..3c4880df9 100644 --- a/src/lib/core/EventWidget.ts +++ b/src/lib/core/EventWidget.ts @@ -1,6 +1,5 @@ import { EventEmitter } from 'events'; import { NativeElement, Component, NativeRawPointer } from './Component'; -import { wrapWithActivateUvLoop } from '../utils/helpers'; function addDefaultErrorHandler(native: NativeElement, emitter: EventEmitter): void { native.subscribeToQtEvent('error'); @@ -39,7 +38,7 @@ export abstract class EventWidget extends Component { super(); if (native.initNodeEventEmitter) { this.emitter = new EventEmitter(); - this.emitter.emit = wrapWithActivateUvLoop(this.emitter.emit.bind(this.emitter)); + this.emitter.emit = this.emitter.emit.bind(this.emitter); native.initNodeEventEmitter(this.emitter.emit); } else { throw new Error('initNodeEventEmitter not implemented on native side'); diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 567c62af6..1c271f57f 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -41,6 +41,10 @@ module.exports = { label: 'Spectrum', href: 'https://spectrum.chat/nodegui', }, + { + label: 'Slack', + href: 'https://nodegui.slack.com', + }, { label: 'Twitter', to: 'https://twitter.com/node_gui',