feature[ats_04296]: Fix new action dialog 2nd page layout

3 files changed, 5 insertions, 6 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
index fc65210f216..9f00cc274bb 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java
@@ -96,7 +96,7 @@ public class NewActionPage1 extends WizardPage {
          String xWidgetXml = getWidgetXml();
          Composite comp = new Composite(parent, SWT.NONE);
          comp.setLayout(new GridLayout(1, false));
-         comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+         comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
          page = new XWidgetPage(xWidgetXml, ATSXWidgetOptionResolver.getInstance());
          page.createBody(null, comp, null, xModListener, true);
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java
index 0b175a000c7..0d2159250a9 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java
@@ -80,7 +80,7 @@ public class NewActionPage2 extends WizardPage {
       stringBuffer.append("<XWidget displayName=\"Change Type\" storageName=\"ats.Change Type\" xwidgetType=\"XCombo(" + ATSXWidgetOptionResolver.OPTIONS_FROM_ATTRIBUTE_VALIDITY + ")\" required=\"true\" horizontalLabel=\"true\" toolTip=\"" + AtsAttributeTypes.ChangeType.getDescription() + "\"/>");
       stringBuffer.append("<XWidget displayName=\"Priority\" storageName=\"ats.Priority\" xwidgetType=\"XCombo(" + ATSXWidgetOptionResolver.OPTIONS_FROM_ATTRIBUTE_VALIDITY + ")\" required=\"true\" horizontalLabel=\"true\"/>");
       stringBuffer.append("<XWidget displayName=\"Deadline\" xwidgetType=\"XDate\" horizontalLabel=\"true\" toolTip=\"" + AtsAttributeTypes.NeedBy.getDescription() + "\"/>");
-      stringBuffer.append("<XWidget displayName=\"Validation Required\" xwidgetType=\"XCheckBox\" horizontalLabel=\"true\" labelAfter=\"true\" toolTip=\"" + AtsAttributeTypes.ValidationRequired.getDescription() + "\"/>");
+      stringBuffer.append("<XWidget displayName=\"Validation Required\" xwidgetType=\"XCheckBox\" fill=\"Vertically\" horizontalLabel=\"true\" labelAfter=\"true\" toolTip=\"" + AtsAttributeTypes.ValidationRequired.getDescription() + "\"/>");
       stringBuffer.append("</WorkPage>");
       return stringBuffer.toString();
    }
@@ -96,8 +96,8 @@ public class NewActionPage2 extends WizardPage {
          String widgetXml = getWidgetXml();
 
          Composite comp = new Composite(parent, SWT.NONE);
-         comp.setLayout(new GridLayout(2, false));
-         comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+         comp.setLayout(new GridLayout(1, false));
+         comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
          page = new XWidgetPage(widgetXml, ATSXWidgetOptionResolver.getInstance());
          page.createBody(null, comp, null, xModListener, true);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java
index 63366df484d..04e5dbcbf10 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/util/SwtXWidgetRenderer.java
@@ -127,12 +127,11 @@ public class SwtXWidgetRenderer {
       final FormToolkit toolkit = managedForm != null ? managedForm.getToolkit() : null;
 
       Composite topLevelComp = createComposite(parent, toolkit);
-
       GridLayout layout = new GridLayout(1, false);
       layout.marginWidth = 2;
       layout.marginHeight = 2;
       topLevelComp.setLayout(layout);
-      topLevelComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+      topLevelComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
       if (toolkit != null) {
          toolkit.adapt(topLevelComp);