Browse Source

enhanced layout of Text Control in Property Sections.
enabled SWT.WRAP
added parent size as default hint to avoid text controls with unlimited size

Andreas Mülder 13 years ago
parent
commit
837430385f

+ 2 - 2
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/StatePropertySection.java

@@ -90,14 +90,14 @@ public class StatePropertySection extends
 		Injector injector = getInjector(SemanticTarget.StateSpecification);
 		Injector injector = getInjector(SemanticTarget.StateSpecification);
 		if (injector != null) {
 		if (injector != null) {
 			txtSpecification = new StyledText(parent, SWT.MULTI | SWT.BORDER
 			txtSpecification = new StyledText(parent, SWT.MULTI | SWT.BORDER
-					| SWT.V_SCROLL);
+					| SWT.V_SCROLL | SWT.WRAP);
 			enableXtext(txtSpecification, injector);
 			enableXtext(txtSpecification, injector);
 			createHelpWidget(parent, txtSpecification,
 			createHelpWidget(parent, txtSpecification,
 					HelpContextIds.SC_PROPERTIES_STATE_EXPRESSION);
 					HelpContextIds.SC_PROPERTIES_STATE_EXPRESSION);
 		} else {
 		} else {
 			txtSpecification = getToolkit().createText(parent, "", SWT.MULTI);
 			txtSpecification = getToolkit().createText(parent, "", SWT.MULTI);
 		}
 		}
-		GridDataFactory.fillDefaults().grab(true, true)
+		GridDataFactory.fillDefaults().grab(true, true).hint(parent.getSize())
 				.applyTo(txtSpecification);
 				.applyTo(txtSpecification);
 	}
 	}
 
 

+ 3 - 4
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/StatechartPropertySection.java

@@ -56,7 +56,6 @@ public class StatechartPropertySection extends
 		createSpecificationControl(leftColumn);
 		createSpecificationControl(leftColumn);
 	}
 	}
 
 
-
 	@Override
 	@Override
 	protected void createRightColumnControls(Composite rightColumn) {
 	protected void createRightColumnControls(Composite rightColumn) {
 		createNameControl(rightColumn);
 		createNameControl(rightColumn);
@@ -80,18 +79,18 @@ public class StatechartPropertySection extends
 				.applyTo(orderElementControl);
 				.applyTo(orderElementControl);
 	}
 	}
 
 
-	private void createSpecificationControl(Composite parent) {
+	private void createSpecificationControl(final Composite parent) {
 		Injector injector = getInjector(SemanticTarget.StatechartSpecification);
 		Injector injector = getInjector(SemanticTarget.StatechartSpecification);
 		if (injector != null) {
 		if (injector != null) {
 			textControl = new StyledText(parent, SWT.MULTI | SWT.BORDER
 			textControl = new StyledText(parent, SWT.MULTI | SWT.BORDER
-					| SWT.V_SCROLL);
+					| SWT.V_SCROLL | SWT.WRAP);
 			enableXtext(textControl, injector);
 			enableXtext(textControl, injector);
 			createHelpWidget(parent, textControl,
 			createHelpWidget(parent, textControl,
 					HelpContextIds.SC_PROPERTIES_STATECHART_EXPRESSION);
 					HelpContextIds.SC_PROPERTIES_STATECHART_EXPRESSION);
 		} else {
 		} else {
 			textControl = getToolkit().createText(parent, "", SWT.MULTI);
 			textControl = getToolkit().createText(parent, "", SWT.MULTI);
 		}
 		}
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(textControl);
+		GridDataFactory.fillDefaults().grab(true, true).hint(parent.getSize()).applyTo(textControl);
 	}
 	}
 
 
 	@Override
 	@Override

+ 2 - 2
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/TransitionPropertySection.java

@@ -48,13 +48,13 @@ public class TransitionPropertySection extends AbstractEditorPropertySection {
 		Injector injector = getInjector(SemanticTarget.TransitionSpecification);
 		Injector injector = getInjector(SemanticTarget.TransitionSpecification);
 		if (injector != null) {
 		if (injector != null) {
 			textControl = new StyledText(parent, SWT.MULTI | SWT.BORDER
 			textControl = new StyledText(parent, SWT.MULTI | SWT.BORDER
-					| SWT.V_SCROLL);
+					| SWT.V_SCROLL | SWT.WRAP);
 			enableXtext(textControl, injector);
 			enableXtext(textControl, injector);
 			createHelpWidget(parent, textControl,HelpContextIds.SC_PROPERTIES_TRANSITION_EXPRESSION);
 			createHelpWidget(parent, textControl,HelpContextIds.SC_PROPERTIES_TRANSITION_EXPRESSION);
 		} else {
 		} else {
 			textControl = getToolkit().createText(parent, "", SWT.MULTI);
 			textControl = getToolkit().createText(parent, "", SWT.MULTI);
 		}
 		}
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(textControl);
+		GridDataFactory.fillDefaults().grab(true, true).hint(parent.getSize()).applyTo(textControl);
 
 
 	}
 	}