From be10c8d49c0f473e2e4e2186fc1ba8f9d0cbb09a Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Mon, 12 May 2014 13:38:04 -0400 Subject: [PATCH] ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls Change-Id: I53291acaa40c5bba926b31937674b1ece5864127 Former-commit-id: 2ea1c1fa6097004515a4aa97ab9fb28a5343e0bd [formerly 2ea1c1fa6097004515a4aa97ab9fb28a5343e0bd [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]] Former-commit-id: 96d155501270d11866dff72ac1c5c0be62075420 Former-commit-id: 473496b99a4ec04cee71991bab33b8b8bcc41a6d --- .../gfe/ui/runtimeui/DialogAreaComposite.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/DialogAreaComposite.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/DialogAreaComposite.java index c5ad0c59e2..516fcd7e3c 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/DialogAreaComposite.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/DialogAreaComposite.java @@ -60,6 +60,7 @@ import com.raytheon.viz.gfe.smartscript.FieldDefinition.FieldType; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * May 30, 2012 randerso Initial creation + * May 12, 2014 16167 ryu Fix sizing and accessibility of content. * * * @@ -72,7 +73,7 @@ public class DialogAreaComposite extends ScrolledComposite { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(DialogAreaComposite.class); - private static final double MAX_HEIGHT_RATIO = 0.85; + private static final double MAX_HEIGHT_RATIO = 0.80; private static final double MAX_WIDTH_RATIO = 0.85; @@ -225,30 +226,27 @@ public class DialogAreaComposite extends ScrolledComposite { } } + Point compositeSize = varFrame.computeSize(SWT.DEFAULT, SWT.DEFAULT); + int xSize = compositeSize.x; + int ySize = compositeSize.y; + + this.setMinSize(new Point(xSize, ySize)); + this.setExpandHorizontal(true); + this.setExpandVertical(true); + Rectangle monitorBounds = this.getDisplay().getPrimaryMonitor() .getBounds(); int maxXSize = (int) (monitorBounds.width * MAX_WIDTH_RATIO); int maxYSize = (int) (monitorBounds.height * MAX_HEIGHT_RATIO); - Point compositeSize = varFrame.computeSize(SWT.DEFAULT, SWT.DEFAULT); - int xSize = compositeSize.x; - int ySize = compositeSize.y; - if (xSize > maxXSize) { - xSize = maxXSize; - } - if (ySize > maxYSize) { - ySize = maxYSize; - } + maxXSize = Math.min(maxXSize, xSize); + maxYSize = Math.min(maxYSize, ySize); GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true); - gd.heightHint = ySize; - gd.widthHint = xSize; + gd.heightHint = maxYSize; + gd.widthHint = maxXSize; this.setLayoutData(gd); - - this.setMinSize(new Point(xSize, ySize)); - this.setExpandHorizontal(true); - this.setExpandVertical(true); - + // Make sure widgets are scrolled into view when they gain focus // see: // http://www.java2s.com/Code/Java/SWT-JFace-Eclipse/ScrollSWTwidgetsintoviewwhentheygetfocus.htm