From 82552a0fc8a0b7a76c646c5f046c0e30e0e1e40f Mon Sep 17 00:00:00 2001
From: Atul R <atulanand94@gmail.com>
Date: Mon, 27 May 2019 23:00:13 +0200
Subject: [PATCH] Now all js widgets have access to all methods of
 nodewidget(qwidget)

---
 demo.ts                                |  2 +-
 src/lib/QtGui/QWidget/index.ts         | 30 +++++++++++++++-----------
 src/lib/QtWidgets/QGridLayout/index.ts |  6 +++---
 src/lib/QtWidgets/QLabel/index.ts      | 12 +++++------
 src/lib/QtWidgets/QMainWindow/index.ts | 24 ++++++---------------
 src/lib/QtWidgets/QPushButton/index.ts | 16 +++++---------
 6 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/demo.ts b/demo.ts
index 1bbc869b1..a479279e3 100644
--- a/demo.ts
+++ b/demo.ts
@@ -9,7 +9,6 @@ const view = new QWidget();
 win.setCentralWidget(view);
 
 const gridLayout = new QGridLayout();
-
 const label = new QLabel();
 label.setText("Testing1234");
 
@@ -19,6 +18,7 @@ label2.setStyleSheet("background-color:blue; color:white;");
 
 const button1 = new QPushButton();
 button1.setText("Yolo");
+
 // button1.setEventListener("click", () => {
 //   console.log("button clicked");
 // });
diff --git a/src/lib/QtGui/QWidget/index.ts b/src/lib/QtGui/QWidget/index.ts
index 42aba868a..92dcf597d 100644
--- a/src/lib/QtGui/QWidget/index.ts
+++ b/src/lib/QtGui/QWidget/index.ts
@@ -2,18 +2,10 @@ import addon from "../../core/addon";
 import { QLayout } from "../../QtWidgets/QLayout";
 import { Component } from "../../core/Component";
 
-export class QWidget extends Component {
-  native: any;
-  layout?: QLayout;
-  constructor(parent?: QWidget) {
-    super();
-    if (parent) {
-      this.native = new addon.QWidget(parent.native);
-      this.parent = parent;
-    } else {
-      this.native = new addon.QWidget();
-    }
-  }
+// Implement all native QWidget methods here so that all widgets get access to those aswell
+export abstract class NodeWidget extends Component {
+  abstract native: any;
+  abstract layout?: QLayout;
   show() {
     this.native.show();
   }
@@ -31,3 +23,17 @@ export class QWidget extends Component {
     this.native.setStyleSheet(style);
   }
 }
+
+export class QWidget extends NodeWidget {
+  layout?: QLayout;
+  native: any;
+  constructor(parent?: QWidget) {
+    super();
+    if (parent) {
+      this.native = new addon.QWidget(parent.native);
+      this.parent = parent;
+    } else {
+      this.native = new addon.QWidget();
+    }
+  }
+}
diff --git a/src/lib/QtWidgets/QGridLayout/index.ts b/src/lib/QtWidgets/QGridLayout/index.ts
index 1aed8d846..f11ea9fe6 100644
--- a/src/lib/QtWidgets/QGridLayout/index.ts
+++ b/src/lib/QtWidgets/QGridLayout/index.ts
@@ -1,10 +1,10 @@
 import addon from "../../core/addon";
-import { QWidget } from "../../QtGui/QWidget";
+import { NodeWidget } from "../../QtGui/QWidget";
 import { Component } from "../../core/Component";
 
 export class QGridLayout extends Component {
   native: any;
-  constructor(parent?: QWidget) {
+  constructor(parent?: NodeWidget) {
     super();
     if (parent) {
       this.native = new addon.QGridLayout(parent.native);
@@ -13,7 +13,7 @@ export class QGridLayout extends Component {
       this.native = new addon.QGridLayout();
     }
   }
-  addWidget(widget: Component) {
+  addWidget(widget: NodeWidget) {
     this.native.addWidget(widget.native);
     this.children.add(widget);
   }
diff --git a/src/lib/QtWidgets/QLabel/index.ts b/src/lib/QtWidgets/QLabel/index.ts
index eb4277fbf..c8d94aa31 100644
--- a/src/lib/QtWidgets/QLabel/index.ts
+++ b/src/lib/QtWidgets/QLabel/index.ts
@@ -1,10 +1,11 @@
 import addon from "../../core/addon";
-import { QWidget } from "../../QtGui/QWidget";
-import { Component } from "../../core/Component";
+import { NodeWidget } from "../../QtGui/QWidget";
+import { QLayout } from "../QLayout";
 
-export class QLabel extends Component {
+export class QLabel extends NodeWidget {
   native: any;
-  constructor(parent?: QWidget) {
+  layout?: QLayout;
+  constructor(parent?: NodeWidget) {
     super();
     if (parent) {
       this.native = new addon.QLabel(parent.native);
@@ -19,7 +20,4 @@ export class QLabel extends Component {
   setText(text: string) {
     this.native.setText(text);
   }
-  setStyleSheet(style: string) {
-    this.native.setStyleSheet(style);
-  }
 }
diff --git a/src/lib/QtWidgets/QMainWindow/index.ts b/src/lib/QtWidgets/QMainWindow/index.ts
index 14fa929fe..4a3ce0300 100644
--- a/src/lib/QtWidgets/QMainWindow/index.ts
+++ b/src/lib/QtWidgets/QMainWindow/index.ts
@@ -1,10 +1,10 @@
 import addon from "../../core/addon";
-import { QWidget } from "../../QtGui/QWidget";
-import { Component } from "../../core/Component";
-
-export class QMainWindow extends Component {
+import { NodeWidget } from "../../QtGui/QWidget";
+import { QLayout } from "../QLayout";
+export class QMainWindow extends NodeWidget {
+  layout?: QLayout;
   native: any;
-  constructor(parent?: QWidget) {
+  constructor(parent?: NodeWidget) {
     super();
     if (parent) {
       this.native = new addon.QMainWindow(parent.native);
@@ -13,19 +13,7 @@ export class QMainWindow extends Component {
       this.native = new addon.QMainWindow();
     }
   }
-  setStyleSheet(style: string) {
-    this.native.setStyleSheet(style);
-  }
-  show() {
-    this.native.show();
-  }
-  resize(width: number, height: number) {
-    this.native.resize(width, height);
-  }
-  close() {
-    this.native.close();
-  }
-  setCentralWidget(widget: QWidget) {
+  setCentralWidget(widget: NodeWidget) {
     this.native.setCentralWidget(widget.native);
     this.children.add(widget);
   }
diff --git a/src/lib/QtWidgets/QPushButton/index.ts b/src/lib/QtWidgets/QPushButton/index.ts
index af88a3a59..c2f0924ea 100644
--- a/src/lib/QtWidgets/QPushButton/index.ts
+++ b/src/lib/QtWidgets/QPushButton/index.ts
@@ -1,13 +1,10 @@
 import addon from "../../core/addon";
-import { QWidget } from "../../QtGui/QWidget";
-import { EventComponent } from "../../core/EventComponent";
-
-export class QPushButton extends EventComponent {
+import { NodeWidget } from "../../QtGui/QWidget";
+import { QLayout } from "../QLayout";
+export class QPushButton extends NodeWidget {
+  layout?: QLayout;
   native: any;
-  setEventListener(event: string, callback: () => void): void {
-    throw new Error("Method not implemented.");
-  }
-  constructor(parent?: QWidget) {
+  constructor(parent?: NodeWidget) {
     super();
     if (parent) {
       this.native = new addon.QPushButton(parent.native);
@@ -19,7 +16,4 @@ export class QPushButton extends EventComponent {
   setText(text: string) {
     this.native.setText(text);
   }
-  setStyleSheet(style: string) {
-    this.native.setStyleSheet(style);
-  }
 }