private static final String DEFAULT_MACHINE = "Am2900Simple";// TODO don't hardcode that here!
private MachineCombo machineSelect;
+ private Label machineDescription;
private MachineDefinition defaultMachineDefinition;
private MachineContext machineContext;
private void addFirstSection(Composite parent)
{
- Composite composite = createDefaultComposite(parent);
+ Composite composite = createDefaultComposite(parent, false);
// Label for path field
Label pathLabel = new Label(composite, SWT.NONE);
private void addSecondSection(Composite parent)
{
- Composite composite = createDefaultComposite(parent);
+ Composite composite = createDefaultComposite(parent, true);
// Label for machine
Label ownerLabel = new Label(composite, SWT.NONE);
// Machine choice
machineSelect = MachineContextSwtTools.createMachineSelector(composite, SWT.NONE);
- if (currentId.isPresent())
- machineSelect.add(currentId.get());
+ machineDescription = new Label(composite, SWT.NONE);
+ machineSelect.addListener(md -> machineDescription.setText(md.getDescription()));
+ machineDescription.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
Optional<MachineDefinition> currentMachineDefinition = machineContext.getMachineDefinition();
return composite;
}
- private Composite createDefaultComposite(Composite parent)
+ private Composite createDefaultComposite(Composite parent, boolean grabExcessVerticalSpace)
{
Composite composite = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
GridData data = new GridData();
data.verticalAlignment = GridData.FILL;
data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ data.grabExcessVerticalSpace = grabExcessVerticalSpace;
composite.setLayoutData(data);
return composite;