From 591ab819e594d97b42a9ed7ce72f91124fa52af4 Mon Sep 17 00:00:00 2001 From: Jumper Chen Date: Tue, 9 Jan 2024 14:29:42 +0800 Subject: [PATCH] fix a mistaken removal from removing IE code that causes B95-ZK-4669.zul case. --- zul/src/main/resources/web/js/zul/box/Box.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zul/src/main/resources/web/js/zul/box/Box.ts b/zul/src/main/resources/web/js/zul/box/Box.ts index 2dccc6f83a..a0ebc5ccca 100644 --- a/zul/src/main/resources/web/js/zul/box/Box.ts +++ b/zul/src/main/resources/web/js/zul/box/Box.ts @@ -541,6 +541,11 @@ export class Box extends zul.Widget { override resetSize_(orient: zk.FlexOrient): void { //@Overrid zk.Widget#resetSize_, called when beforeSize super.resetSize_(orient); + // B85-ZK-3516: remove size of frame + var n = this.$n()!; + if (!n.scrollTop && !n.scrollLeft) + this.$n('frame')!.style[orient == 'w' ? 'width' : 'height'] = ''; + var vert = this.isVertical(), k = -1, szes = this._sizes;