diff options
author | Mickael ADAM | 2015-06-09 15:28:06 +0000 |
---|---|---|
committer | Camille Letavernier | 2015-06-10 11:09:37 +0000 |
commit | 0a784e5f27942aa469f757a89c6a6aa56e9b92d5 (patch) | |
tree | 721e053768722e7245d65ad7136841865c75041c /plugins/views | |
parent | 09fa3cfa80be3b89e150d132dd1453de2ada0746 (diff) | |
download | org.eclipse.papyrus-0a784e5f27942aa469f757a89c6a6aa56e9b92d5.tar.gz org.eclipse.papyrus-0a784e5f27942aa469f757a89c6a6aa56e9b92d5.tar.xz org.eclipse.papyrus-0a784e5f27942aa469f757a89c6a6aa56e9b92d5.zip |
Some fix and some change on master for advance Appearance property View.
-PapyrusRoundedEditPartHelper => to avoid bad display if radius width
xor
radius height = 0 and some fix
-MaskManagedFloatingLabelEditPolicy => fix, the mask label must be
defined
at the label level
-RoundedCompartmentFigure => set shadow color must allow Integer Color
from Draw2D
-LabelCustomizationMaskProvide r=> add case of FloatingLabel Mask
manager
-GridData => change some properties from protected to public to acced to
the width of the property view: necessary for papyrusRowLayout.
Change-Id: I887ebb42abd0bd4332d0f956e8e882a7b7b0d5e7
Signed-off-by: Mickael ADAM <mickael.adam@ALL4TEC.net>
Reviewed-on: https://git.eclipse.org/r/49808
Tested-by: Hudson CI
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'plugins/views')
-rw-r--r-- | plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/layout/GridData.java | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/layout/GridData.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/layout/GridData.java index 2ae001772fe..4957028b37e 100644 --- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/layout/GridData.java +++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/layout/GridData.java @@ -360,7 +360,7 @@ public final class GridData { protected int defaultWhint, defaultHhint, defaultWidth = -1, defaultHeight = -1; - protected int currentWhint, currentHhint, currentWidth = -1, currentHeight = -1; + public int currentWhint, currentHhint, currentWidth = -1, currentHeight = -1; /** * Constructs a new instance of GridData using @@ -610,49 +610,38 @@ public final class GridData { } String string = getName() + " {"; //$NON-NLS-1$ string += "horizontalAlignment=" + hAlign + " "; //$NON-NLS-1$ //$NON-NLS-2$ - if (horizontalIndent != 0) - { + if (horizontalIndent != 0) { string += "horizontalIndent=" + horizontalIndent + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (horizontalSpan != 1) - { + if (horizontalSpan != 1) { string += "horizontalSpan=" + horizontalSpan + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (grabExcessHorizontalSpace) - { + if (grabExcessHorizontalSpace) { string += "grabExcessHorizontalSpace=" + grabExcessHorizontalSpace + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (widthHint != SWT.DEFAULT) - { + if (widthHint != SWT.DEFAULT) { string += "widthHint=" + widthHint + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (minimumWidth != 0) - { + if (minimumWidth != 0) { string += "minimumWidth=" + minimumWidth + " "; //$NON-NLS-1$ //$NON-NLS-2$ } string += "verticalAlignment=" + vAlign + " "; //$NON-NLS-1$ //$NON-NLS-2$ - if (verticalIndent != 0) - { + if (verticalIndent != 0) { string += "verticalIndent=" + verticalIndent + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (verticalSpan != 1) - { + if (verticalSpan != 1) { string += "verticalSpan=" + verticalSpan + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (grabExcessVerticalSpace) - { + if (grabExcessVerticalSpace) { string += "grabExcessVerticalSpace=" + grabExcessVerticalSpace + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (heightHint != SWT.DEFAULT) - { + if (heightHint != SWT.DEFAULT) { string += "heightHint=" + heightHint + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (minimumHeight != 0) - { + if (minimumHeight != 0) { string += "minimumHeight=" + minimumHeight + " "; //$NON-NLS-1$ //$NON-NLS-2$ } - if (exclude) - { + if (exclude) { string += "exclude=" + exclude + " "; //$NON-NLS-1$ //$NON-NLS-2$ } string = string.trim(); |