Merge pull request #123 from dragonly/master

fix UiWindow.conContentSizeChanged in utils.js and example
parro-it · Sep 27, 2018 · 8e3bc58 · 8e3bc58
2 parents ab76d87 + 5a1210e
commit 8e3bc58
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/examples/control-gallery.js b/examples/control-gallery.js
@@ -53,8 +53,8 @@ libui.Ui.onShouldQuit(() => {
 	onClosing();
 });
 
-function onPositionChanged() {
-	status.text = `(${win.position.x}, ${win.position.y}) - (${win.contentSize.w} x ${win.contentSize.h})`;
+function onContentSizeChanged() {
+	status.text = `window size: (${win.contentSize.w} x ${win.contentSize.h})`;
 }
 
 const updateValue = value => {
@@ -206,7 +206,7 @@ const winProps = {
 	width: 640,
 	height: 480,
 	onClosing,
-	onContentSizeChanged: onPositionChanged
+	onContentSizeChanged: onContentSizeChanged
 };
 
 win = window(
@@ -270,7 +270,7 @@ win = window(
 						stretchy: true
 					}),
 					area)))),
-	(status = label({stretchy: true, text: '(0, 0)'})));
+	(status = label({stretchy: true, text: `window size: (${winProps.width} x ${winProps.height})`})));
 
 win.show();
 libui.startLoop();
diff --git a/examples/utils.js b/examples/utils.js
@@ -136,7 +136,8 @@ function window(
 		hasMenubar = false,
 		fullscreen = false,
 		borderless = false,
-		onClosing = null
+		onClosing = null,
+		onContentSizeChanged= null,
 	},
 	...children) {
 	const win = new libui.UiWindow(title, width, height, hasMenubar);
@@ -147,6 +148,9 @@ function window(
 	if (onClosing) {
 		win.onClosing(onClosing);
 	}
+	if (onContentSizeChanged) {
+		win.onContentSizeChanged(onContentSizeChanged)
+	}
 
 	win.setChild(wrapChildren(children));