From 52deadd796e6724b6e4d2a28eb508bfebfd8ef92 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Thu, 30 Aug 2018 22:50:47 +0300
Subject: [PATCH] Connection wizard pages resize fix

---
 .../connection/DriverPropertiesDialogPage.java | 18 ++++++++++++++++--
 .../src/org/jkiss/dbeaver/ui/UIUtils.java      |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java
index 9f1b4d0ddc..a1f96e91bc 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/DriverPropertiesDialogPage.java
@@ -17,6 +17,8 @@
 package org.jkiss.dbeaver.ui.dialogs.connection;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
@@ -26,6 +28,7 @@ import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
 import org.jkiss.dbeaver.runtime.properties.PropertySourceCustom;
+import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.lang.reflect.InvocationTargetException;
@@ -126,8 +129,19 @@ public class DriverPropertiesDialogPage extends ConnectionPageAbstract
     @Override
     public void createControl(Composite parent)
     {
-        propsControl = new ConnectionPropertiesControl(parent, SWT.NONE);
-        setControl(propsControl.getControl());
+        Composite ph = UIUtils.createPlaceholder(parent, 1);
+        if (parent.getLayout() instanceof GridLayout) {
+            ph.setLayoutData(new GridData(GridData.FILL_BOTH));
+        }
+        propsControl = new ConnectionPropertiesControl(ph, SWT.NONE);
+        Object layoutData = propsControl.getTree().getLayoutData();
+        if (layoutData == null) {
+            layoutData = new GridData(GridData.FILL_BOTH);
+        }
+        if (layoutData instanceof GridData) {
+            ((GridData) layoutData).heightHint = 200;
+        }
+        setControl(ph);
     }
 
 }
diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java
index b61d122909..7d684ac06c 100644
--- a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java
+++ b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java
@@ -1652,7 +1652,7 @@ public class UIUtils {
 
     public static void resizeShell(Shell shell) {
         Point shellSize = shell.getSize();
-        Point compSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+        Point compSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
         //compSize.y += 20;
         //compSize.x += 20;
         if (shellSize.y < compSize.y || shellSize.x < compSize.x) {
-- 
GitLab