From 39dde1d9a77770c7c5d36aef380f2753b67ff43c Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 13 Aug 2019 16:57:56 +0200 Subject: [PATCH] SEBSERV-84 fixed also for Chrome and IE --- .../ethz/seb/sebserver/gui/widget/MultiSelectionCombo.java | 5 +++-- .../java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/MultiSelectionCombo.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/MultiSelectionCombo.java index fa6e3670..1f006b87 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/MultiSelectionCombo.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/MultiSelectionCombo.java @@ -206,8 +206,9 @@ public final class MultiSelectionCombo extends Composite implements Selection { this.selectionControls.add(new Tuple<>(label, imageButton)); this.combo.remove(itemName); - this.updateAnchor.layout(); PageService.updateScrolledComposite(this); + this.updateAnchor.layout(true, true); + } private void removeComboSelection(final Event event) { @@ -233,8 +234,8 @@ public final class MultiSelectionCombo extends Composite implements Selection { final Tuple value = this.selectedValues.remove(indexOf); this.combo.add(value._2, this.combo.getItemCount()); - this.updateAnchor.layout(); PageService.updateScrolledComposite(this); + this.updateAnchor.layout(true, true); if (this.listener != null) { this.listener.handleEvent(event); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java index b1c3d10e..ac6006d2 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java @@ -540,7 +540,8 @@ public class WidgetFactory { parent, this, actionLocTextPrefix, - parent); + // NOTE parent would work for firefox but on IE and Chrome only parent.getParent().getParent() works + parent.getParent().getParent()); break; case MULTI_CHECKBOX: selection = new MultiSelectionCheckbox(parent);