From b7476a4ea12063dda3969e65e06dd50d9a15949e Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Fri, 29 Apr 2022 19:40:30 +0200 Subject: [PATCH] Remove `NodeFrame`, use `QFrame` instead --- src/lib/QtWidgets/QAbstractScrollArea.ts | 4 +- src/lib/QtWidgets/QFrame.ts | 64 ++++++++++++------------ src/lib/QtWidgets/QLabel.ts | 4 +- src/lib/QtWidgets/QSplitter.ts | 4 +- src/lib/QtWidgets/QStackedWidget.ts | 4 +- 5 files changed, 39 insertions(+), 41 deletions(-) diff --git a/src/lib/QtWidgets/QAbstractScrollArea.ts b/src/lib/QtWidgets/QAbstractScrollArea.ts index e1a02471a..7fb63a4ac 100644 --- a/src/lib/QtWidgets/QAbstractScrollArea.ts +++ b/src/lib/QtWidgets/QAbstractScrollArea.ts @@ -1,5 +1,5 @@ import { QWidget } from './QWidget'; -import { NodeFrame, QFrameSignals } from './QFrame'; +import { QFrame, QFrameSignals } from './QFrame'; import { ScrollBarPolicy } from '../QtEnums/ScrollBarPolicy'; import { QSize } from '../QtCore/QSize'; import { QScrollBar } from './QScrollBar'; @@ -17,7 +17,7 @@ import { QScrollBar } from './QScrollBar'; QAbstractScrollArea will list all methods and properties that are common to all scrollable widgets in the NodeGui world. */ -export abstract class QAbstractScrollArea extends NodeFrame { +export abstract class QAbstractScrollArea extends QFrame { viewportWidget?: QWidget; setViewport(widget: QWidget): void { this.viewportWidget = widget; diff --git a/src/lib/QtWidgets/QFrame.ts b/src/lib/QtWidgets/QFrame.ts index a292c2c7f..bac971517 100644 --- a/src/lib/QtWidgets/QFrame.ts +++ b/src/lib/QtWidgets/QFrame.ts @@ -4,7 +4,37 @@ import { NativeElement } from '../core/Component'; import { checkIfNativeElement } from '../utils/helpers'; import { QRect } from '../QtCore/QRect'; -export abstract class NodeFrame extends QWidget { +/** + > Create and control frame. + +* **This class is a JS wrapper around Qt's [QFrame class](https://doc.qt.io/qt-5/qframe.html)** + +The QFrame class is the base class of widgets that can have a frame. It can be used directly for creating simple placeholder frames without any contents. + +### Example + +```javascript +const { QFrame } = require("@nodegui/nodegui"); + +const frame = new QFrame(); +``` + */ +export class QFrame extends QWidget { + constructor(arg?: QWidget | NativeElement) { + let native: NativeElement; + let parent; + if (checkIfNativeElement(arg)) { + native = arg as NativeElement; + } else if (arg as QWidget) { + parent = arg as QWidget; + native = new addon.QFrame(parent.native); + } else { + native = new addon.QFrame(); + } + super(native); + this.setNodeParent(parent); + } + setFrameRect(r: QRect): void { this.setProperty('frameRect', r.native); } @@ -63,35 +93,3 @@ export enum Shape { } export type QFrameSignals = QWidgetSignals; - -/** - > Create and control frame. - -* **This class is a JS wrapper around Qt's [QFrame class](https://doc.qt.io/qt-5/qframe.html)** - -The QFrame class is the base class of widgets that can have a frame. It can be used directly for creating simple placeholder frames without any contents. - -### Example - -```javascript -const { QFrame } = require("@nodegui/nodegui"); - -const frame = new QFrame(); -``` - */ -export class QFrame extends NodeFrame { - constructor(arg?: QWidget | NativeElement) { - let native: NativeElement; - let parent; - if (checkIfNativeElement(arg)) { - native = arg as NativeElement; - } else if (arg as QWidget) { - parent = arg as QWidget; - native = new addon.QFrame(parent.native); - } else { - native = new addon.QFrame(); - } - super(native); - this.setNodeParent(parent); - } -} diff --git a/src/lib/QtWidgets/QLabel.ts b/src/lib/QtWidgets/QLabel.ts index 66f10ff15..b71c10679 100644 --- a/src/lib/QtWidgets/QLabel.ts +++ b/src/lib/QtWidgets/QLabel.ts @@ -1,6 +1,6 @@ import addon from '../utils/addon'; import { QWidget } from './QWidget'; -import { NodeFrame, QFrameSignals } from './QFrame'; +import { QFrame, QFrameSignals } from './QFrame'; import { QPixmap } from '../QtGui/QPixmap'; import { QMovie } from '../QtGui/QMovie'; import { AlignmentFlag } from '../QtEnums/AlignmentFlag'; @@ -26,7 +26,7 @@ label.setText("Hello"); ``` */ -export class QLabel extends NodeFrame { +export class QLabel extends QFrame { private _picture?: QPicture; private _pixmap?: QPixmap; private _movie?: QMovie; diff --git a/src/lib/QtWidgets/QSplitter.ts b/src/lib/QtWidgets/QSplitter.ts index e00ea5612..807813cd5 100644 --- a/src/lib/QtWidgets/QSplitter.ts +++ b/src/lib/QtWidgets/QSplitter.ts @@ -1,6 +1,6 @@ import addon from '../utils/addon'; import { QWidget } from './QWidget'; -import { NodeFrame, QFrameSignals } from './QFrame'; +import { QFrame, QFrameSignals } from './QFrame'; import { NativeElement } from '../core/Component'; import { Orientation } from '../QtEnums'; @@ -34,7 +34,7 @@ splitterHorizontal.addWidget(right); ``` */ -export class QSplitter extends NodeFrame { +export class QSplitter extends QFrame { constructor(parent?: QWidget) { let native: NativeElement; if (parent) { diff --git a/src/lib/QtWidgets/QStackedWidget.ts b/src/lib/QtWidgets/QStackedWidget.ts index dd7b0a639..a0c45831f 100644 --- a/src/lib/QtWidgets/QStackedWidget.ts +++ b/src/lib/QtWidgets/QStackedWidget.ts @@ -1,6 +1,6 @@ import addon from '../utils/addon'; import { QWidget } from './QWidget'; -import { NodeFrame, QFrameSignals } from './QFrame'; +import { QFrame, QFrameSignals } from './QFrame'; /** @@ -43,7 +43,7 @@ win.show(); ``` */ -export class QStackedWidget extends NodeFrame { +export class QStackedWidget extends QFrame { constructor(parent?: QWidget) { let native; if (parent) {