diff --git a/apps/app/ui-tests-app/layouts-percent/myview.ts b/apps/app/ui-tests-app/layouts-percent/myview.ts index 92ae630f0..3fdfccc49 100644 --- a/apps/app/ui-tests-app/layouts-percent/myview.ts +++ b/apps/app/ui-tests-app/layouts-percent/myview.ts @@ -26,6 +26,15 @@ export class ViewModelWithPercentage extends ViewModelBase { } } + public onMinWidthMinHeight(args: { eventName: string, object: any }): void { + let view = args.object; + if (!PercentLength.equals(view.marginLeft, 105)) { + super.setMinWidthHeight(view, 105, 55); + } else { + super.setMinWidthHeight(view, 0, 0); + } + } + public onAllProperties(args: { eventName: string, object: any }): void { let child: any; let layout: any = args.object.parent; @@ -41,9 +50,9 @@ export class ViewModelWithPercentage extends ViewModelBase { // MinWidthMinHeight child = layout.getViewById("minWidthMinHeight"); if (child.minWidth !== 105) { - super.setWidthHeight(child, 105, 55); + super.setMinWidthHeight(child, 105, 55); } else { - super.setWidthHeight(child, 0, 0); + super.setMinWidthHeight(child, 0, 0); } // Margins diff --git a/apps/app/ui-tests-app/layouts/myview-base.ts b/apps/app/ui-tests-app/layouts/myview-base.ts index bb98a7265..d61adaeb9 100644 --- a/apps/app/ui-tests-app/layouts/myview-base.ts +++ b/apps/app/ui-tests-app/layouts/myview-base.ts @@ -35,6 +35,11 @@ export class ViewModelBase extends Observable { child.height = height; } + protected setMinWidthHeight(child: any, minWidth: any, minHeight: any) { + child.minWidth = minWidth; + child.minHeight = minHeight; + } + protected setMargins(child: any, marginLeft: any, marginTop: any, marginRight: any, marginBottom: any) { child.marginLeft = marginLeft; child.marginTop = marginTop; @@ -72,4 +77,4 @@ export class ViewModelBase extends Observable { child.visibility = "visible"; } } -} +} \ No newline at end of file diff --git a/apps/app/ui-tests-app/layouts/myview.ts b/apps/app/ui-tests-app/layouts/myview.ts index 937b7d082..115e91836 100644 --- a/apps/app/ui-tests-app/layouts/myview.ts +++ b/apps/app/ui-tests-app/layouts/myview.ts @@ -20,9 +20,9 @@ export class ViewModel extends ViewModelBase { public onMinWidthMinHeight(args: { eventName: string, object: any }): void { var view: View = args.object; if (view.minWidth !== 105) { - super.setWidthHeight(view, 105, 55); + super.setMinWidthHeight(view, 105, 55); } else { - super.setWidthHeight(view, 0, 0); + super.setMinWidthHeight(view, 0, 0); } } @@ -50,9 +50,9 @@ export class ViewModel extends ViewModelBase { // MinWidthMinHeight child = layout.getViewById("minWidthMinHeight"); if (child.minWidth !== 105) { - super.setWidthHeight(child, 105, 55); + super.setMinWidthHeight(child, 105, 55); } else { - super.setWidthHeight(child, 0, 0); + super.setMinWidthHeight(child, 0, 0); } // Margins child = layout.getViewById("margins");