From f9a209f34a6e2b5d3e377c6c2673030f82d72e9f Mon Sep 17 00:00:00 2001 From: Atul R Date: Thu, 6 Jun 2019 11:34:06 +0200 Subject: [PATCH] All layouts inherit from qlayout on js side. --- src/lib/QtWidgets/QGridLayout/index.ts | 4 ++-- src/lib/QtWidgets/QLayout/index.ts | 6 ++---- src/lib/core/FlexLayout/FlexNode/index.ts | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/QtWidgets/QGridLayout/index.ts b/src/lib/QtWidgets/QGridLayout/index.ts index f11ea9fe6..59dc45945 100644 --- a/src/lib/QtWidgets/QGridLayout/index.ts +++ b/src/lib/QtWidgets/QGridLayout/index.ts @@ -1,8 +1,8 @@ import addon from "../../core/addon"; import { NodeWidget } from "../../QtGui/QWidget"; -import { Component } from "../../core/Component"; +import { QLayout } from "../QLayout"; -export class QGridLayout extends Component { +export class QGridLayout extends QLayout { native: any; constructor(parent?: NodeWidget) { super(); diff --git a/src/lib/QtWidgets/QLayout/index.ts b/src/lib/QtWidgets/QLayout/index.ts index 9fe4304c1..552b543ed 100644 --- a/src/lib/QtWidgets/QLayout/index.ts +++ b/src/lib/QtWidgets/QLayout/index.ts @@ -1,6 +1,4 @@ -import addon from "../../core/addon"; import { Component } from "../../core/Component"; -export class QLayout extends Component { - native = new addon.QLayout(); -} +// All Layouts should extend this abstract class. +export abstract class QLayout extends Component {} diff --git a/src/lib/core/FlexLayout/FlexNode/index.ts b/src/lib/core/FlexLayout/FlexNode/index.ts index ef75f280f..95f65ffca 100644 --- a/src/lib/core/FlexLayout/FlexNode/index.ts +++ b/src/lib/core/FlexLayout/FlexNode/index.ts @@ -1,6 +1,6 @@ -import { Component } from "../../../core/Component"; +import { QLayout } from "../../../QtWidgets/QLayout"; -export class FlexNode extends Component { +export class FlexNode extends QLayout { native: any; constructor(nativeNode: any) { super();