[470859] Manage RegionContainer specified size

If the specifier set some size expression in the Region and
RegionContainer styles, the RegionContainer has to be in auto-size if
the Region have a bigger size.

Bug: 470859
Change-Id: I043265e0c9787ee005c40c427d10cd430ca6d41f
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

1 files changed, 6 insertions, 0 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java
index 7fe6230e2c..c95547ec82 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java
@@ -152,8 +152,14 @@ public class RegionContainerUpdateLayoutOperation extends AbstractModelChangeOpe
             Size size = (Size) layoutConstraint;
             if (vertical) {
                 size.setHeight(-1);
+                if (size.getWidth() != -1 && size.getWidth() < commonWidth) {
+                    size.setWidth(-1);
+                }
             } else {
                 size.setWidth(-1);
+                if (size.getHeight() != -1 && size.getHeight() < commonHeight) {
+                    size.setHeight(-1);
+                }
             }
         }