Fix minor heirarchy bugs
This commit is contained in:
parent
201ab3657f
commit
0d10ad8215
20
demo.ts
20
demo.ts
@ -16,6 +16,7 @@ const testGridLayout = () => {
|
||||
win.setCentralWidget(view);
|
||||
|
||||
const gridLayout = new QGridLayout();
|
||||
|
||||
const label = new QLabel();
|
||||
label.setText("Testing1234");
|
||||
label.setStyleSheet("background-color:blue; color:white;");
|
||||
@ -52,21 +53,26 @@ const testFlexLayout = () => {
|
||||
const win = new QMainWindow();
|
||||
const view = new QWidget();
|
||||
win.setCentralWidget(view);
|
||||
const label = new QLabel(win);
|
||||
label.setText("Hello12321");
|
||||
label.setStyleSheet("background-color:blue; color:white;");
|
||||
const flayout = new FlexLayout();
|
||||
view.setStyleSheet(
|
||||
`
|
||||
background-color: green;
|
||||
qproperty-flex: 1;
|
||||
qproperty-alignItems: center;
|
||||
qproperty-justifyContent:center;
|
||||
`
|
||||
qproperty-alignItems: center;
|
||||
qproperty-justifyContent:center;
|
||||
`
|
||||
);
|
||||
|
||||
const flayout = new FlexLayout();
|
||||
flayout.setFlexNode(view.getFlexNode());
|
||||
|
||||
const label = new QLabel();
|
||||
label.setText("Hello12321");
|
||||
label.setStyleSheet("background-color:blue; color:white;");
|
||||
|
||||
flayout.addWidget(label, label.getFlexNode());
|
||||
|
||||
view.setLayout(flayout);
|
||||
|
||||
win.show();
|
||||
return win;
|
||||
};
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
"@types/lodash": "^4.14.130",
|
||||
"@types/node": "^12.0.2",
|
||||
"node-gyp": "^4.0.0",
|
||||
"prettier": "^1.17.1",
|
||||
"typescript": "^3.4.5"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
import addon from "../addon";
|
||||
import { QWidget } from "../../QtGui/QWidget";
|
||||
import { NodeWidget } from "../../QtGui/QWidget";
|
||||
import { FlexNode } from "./FlexNode";
|
||||
import { NodeLayout } from "../../QtWidgets/QLayout";
|
||||
|
||||
export class FlexLayout extends NodeLayout {
|
||||
native = new addon.FlexLayout();
|
||||
addWidget(childWidget: QWidget, childFlexNode: FlexNode) {
|
||||
addWidget(childWidget: NodeWidget, childFlexNode: FlexNode) {
|
||||
this.children.add(childWidget);
|
||||
this.native.addWidget(childWidget.native, childFlexNode.native);
|
||||
}
|
||||
|
||||
@ -502,6 +502,11 @@ performance-now@^2.1.0:
|
||||
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
|
||||
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
|
||||
|
||||
prettier@^1.17.1:
|
||||
version "1.17.1"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
|
||||
integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
|
||||
|
||||
process-nextick-args@~2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user