From: Johannes Dahlström Date: Thu, 6 Sep 2012 09:30:51 +0000 (+0300) Subject: Don't use @DelegateToWidget in AbstractSplitPanelState.SplitterState (#9485, #9491) X-Git-Tag: 7.0.0.beta1~171 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f1a1c19388e34dd65998f855928e371a7587c570;p=vaadin-framework.git Don't use @DelegateToWidget in AbstractSplitPanelState.SplitterState (#9485, #9491) --- diff --git a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java index 229d3894cf..eaf82ff557 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java +++ b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java @@ -150,6 +150,10 @@ public abstract class AbstractSplitPanelConnector extends getWidget().position = splitterState.position + splitterState.positionUnit; + getWidget().setPositionReversed(splitterState.positionReversed); + + getWidget().setLocked(splitterState.locked); + // This is needed at least for cases like #3458 to take // appearing/disappearing scrollbars into account. getConnection().runDescendentsLayout(getWidget()); diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java index 4b50a719e0..733f032726 100644 --- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java +++ b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java @@ -19,7 +19,6 @@ import java.io.Serializable; import com.vaadin.shared.ComponentState; import com.vaadin.shared.Connector; -import com.vaadin.shared.annotations.DelegateToWidget; public class AbstractSplitPanelState extends ComponentState { @@ -34,11 +33,7 @@ public class AbstractSplitPanelState extends ComponentState { public String minPositionUnit; public float maxPosition; public String maxPositionUnit; - - @DelegateToWidget public boolean positionReversed = false; - - @DelegateToWidget public boolean locked = false; } } \ No newline at end of file