diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-09-06 12:30:51 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-09-06 12:32:26 +0300 |
| commit | f1a1c19388e34dd65998f855928e371a7587c570 (patch) | |
| tree | 89bad6b0dd4ee47617103a7bae4dfac89212d0e0 | |
| parent | a6688c9362d8f2d87b8334b21ecf966789900ceb (diff) | |
| download | vaadin-framework-f1a1c19388e34dd65998f855928e371a7587c570.tar.gz vaadin-framework-f1a1c19388e34dd65998f855928e371a7587c570.zip | |
Don't use @DelegateToWidget in AbstractSplitPanelState.SplitterState (#9485, #9491)
| -rw-r--r-- | client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java | 4 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java | 5 |
2 files changed, 4 insertions, 5 deletions
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 |