Skip to content

Commit 8cc4b3a

Browse files
authored
Merge pull request #59 from nodegui/fix/win-not-closing
Fix/win not closing
2 parents 92a34cf + 5935f5f commit 8cc4b3a

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"scripts": {
1818
"build": "tsc",
19-
"dev": "tsc && qode ./dist/demo.js",
19+
"dev": "tsc && qode --inspect ./dist/demo.js",
2020
"docs": "typedoc"
2121
},
2222
"dependencies": {

src/components/Image/RNImage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const setImageProps = (
2121
const pixMap = new QPixmap(imageUrl);
2222
widget.setPixmap(pixMap);
2323
const size = widget.size();
24-
widget.scalePixmap(size.width, size.height);
24+
widget.scalePixmap(size.width(), size.height());
2525
},
2626
set aspectRatioMode(mode: AspectRatioMode) {
2727
widget.setAspectRatioMode(mode);

src/components/Image/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ImageConfig extends ComponentConfig {
1818
widget.setProps(newProps, {});
1919
widget.addEventListener(QLabelEvents.Resize, () => {
2020
const size = widget.size();
21-
widget.scalePixmap(size.width, size.height);
21+
widget.scalePixmap(size.width(), size.height());
2222
});
2323
return widget;
2424
}

src/components/View/RNView.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export interface ViewProps extends RNProps {
6565
/**
6666
* This property holds the level of opacity for the window. [QWidget: setWindowOpacity](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowopacityopacity)
6767
*/
68-
windowOpacity?: Number;
68+
windowOpacity?: number;
6969
/**
7070
* Sets the window title property. [QWidget: setWindowTitle](https://docs.nodegui.org/docs/api/NodeWidget#widgetsetwindowtitletitle)
7171
*/
@@ -146,7 +146,7 @@ export const setViewProps = (
146146
set enabled(enable: boolean) {
147147
widget.setEnabled(enable);
148148
},
149-
set windowOpacity(opacity: Number) {
149+
set windowOpacity(opacity: number) {
150150
widget.setWindowOpacity(opacity);
151151
},
152152
set windowTitle(title: string) {

src/reconciler/index.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ const HostConfig: Reconciler.HostConfig<
102102
},
103103
removeChildFromContainer: (container, child) => {
104104
container.delete(child);
105+
if (child.close) {
106+
child.close();
107+
}
105108
},
106109
prepareUpdate: function(
107110
instance,
@@ -149,6 +152,9 @@ const HostConfig: Reconciler.HostConfig<
149152
},
150153
removeChild: (parent: RNWidget, child: NodeWidget) => {
151154
parent.removeChild(child);
155+
if (child.close) {
156+
child.close();
157+
}
152158
},
153159
commitTextUpdate: (textInstance, oldText, newText) => {
154160
//noop since we manage all text using Text component

0 commit comments

Comments
 (0)