Skip to content

Commit 5b31004

Browse files
author
slidinghotdog
committed
Revert "Add geometry prop to View instead of Window"
This reverts commit 042a559.
1 parent 042a559 commit 5b31004

File tree

3 files changed

+15
-1179
lines changed

3 files changed

+15
-1179
lines changed

src/components/View/index.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,10 @@ import {
66
} from "@nodegui/nodegui";
77
import { registerComponent } from "../config";
88

9-
type Geometry = {
10-
x: number;
11-
y: number;
12-
width: number;
13-
height: number;
14-
};
159
export interface ListenerMap {
1610
[key: string]: (payload?: any) => void;
1711
}
1812
export interface ViewProps {
19-
geometry?: Geometry;
2013
id?: string;
2114
style?: string; // Inline style from NodeGui
2215
styleSheet?: string;
@@ -36,14 +29,6 @@ export const setProps = (
3629
oldProps: ViewProps
3730
) => {
3831
const setter: ViewProps = {
39-
set geometry(geometry: Geometry) {
40-
widget.setGeometry(
41-
geometry.x,
42-
geometry.y,
43-
geometry.width,
44-
geometry.height
45-
);
46-
},
4732
set visible(shouldShow: boolean) {
4833
shouldShow ? widget.show() : widget.hide();
4934
},

src/components/Window/index.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@ type WindowSize = {
66
width: number;
77
height: number;
88
};
9+
type Geometry = {
10+
x: number;
11+
y: number;
12+
width: number;
13+
height: number;
14+
};
915
interface WindowProps extends ViewProps {
1016
viewProps?: ViewProps;
1117
fixedSize?: WindowSize | null;
1218
minSize?: WindowSize;
1319
maxSize?: WindowSize;
20+
geometry?: Geometry;
1421
}
1522

1623
const setProps = (
@@ -32,6 +39,14 @@ const setProps = (
3239
window.setMaximumSize(maxSize.width, maxSize.height);
3340
}
3441
},
42+
set geometry(geometry: Geometry) {
43+
window.setGeometry(
44+
geometry.x,
45+
geometry.y,
46+
geometry.width,
47+
geometry.height
48+
);
49+
},
3550
set minSize(size: WindowSize) {
3651
window.setMinimumSize(size.width, size.height);
3752
},

0 commit comments

Comments
 (0)