From 7c1187d21df1408464fe530c85daf49543f8ec6c Mon Sep 17 00:00:00 2001 From: "daeryong.park" Date: Mon, 3 Apr 2017 10:34:51 +0900 Subject: [PATCH] RTSDK : Adjust the border size outside the browser widget - resize default margin 5 to 0 Change-Id: Iaee5a4653a69f17dd6fdef6db1cbd328b273c68d Signed-off-by: daeryong.park --- .../tizen/rt/ide/build/RtosBuildDialogPage.java | 17 +++++++------ .../tizen/rt/ide/build/RtosBuildWizardDialog.java | 2 -- .../rt/ide/wizards/NewRtProjectWizardPage2.java | 28 +++++++++++++++++----- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildDialogPage.java b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildDialogPage.java index ec61859..431340f 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildDialogPage.java +++ b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildDialogPage.java @@ -29,12 +29,9 @@ package org.tizen.rt.ide.build; import java.io.File; -import java.io.FilenameFilter; import java.io.IOException; import java.util.List; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IResource; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -48,6 +45,7 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; +import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Image; @@ -58,16 +56,14 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.Text; import org.tizen.rt.ide.Messages; import org.tizen.rt.ide.RtosCommandManager; import org.tizen.rt.ide.util.ResourceUtil; -import org.tizen.rt.ide.util.SDKUtil; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.events.SelectionAdapter; /** * DeviceGuideDialogPage Select Emulator Wizard Feature @@ -206,9 +202,12 @@ public class RtosBuildDialogPage extends WizardPage { // Description area Composite descComposite = new Composite(container, SWT.BORDER); descComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 2)); - descComposite.setLayout(new GridLayout(1, true)); + GridLayout browserLayout = new GridLayout(1, true); + browserLayout.marginHeight = 0; + browserLayout.marginWidth = 0; + descComposite.setLayout(browserLayout); - browser = new Browser(descComposite, SWT.BORDER); + browser = new Browser(descComposite, SWT.NONE); browser.setJavascriptEnabled(false); browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildWizardDialog.java b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildWizardDialog.java index ce168b7..1077d40 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildWizardDialog.java +++ b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/build/RtosBuildWizardDialog.java @@ -121,8 +121,6 @@ public class RtosBuildWizardDialog extends WizardDialog { }); setButtonLayoutData(make); - // cancel = getButton(IDialogConstants.CANCEL_ID); - // cancel.moveAbove(make); } } diff --git a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewRtProjectWizardPage2.java b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewRtProjectWizardPage2.java index 4f9a9cb..079acc2 100644 --- a/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewRtProjectWizardPage2.java +++ b/rt-ide/tizen.rt.product.plugin/src/org/tizen/rt/ide/wizards/NewRtProjectWizardPage2.java @@ -41,6 +41,7 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -107,10 +108,17 @@ public class NewRtProjectWizardPage2 extends WizardPage { Label lblNewLabel = new Label(composite_l, SWT.NONE); lblNewLabel.setText(Messages.NewArtikProjectWizardPage2_LabelBoard); - table = new Table(composite_l, SWT.BORDER | SWT.FULL_SELECTION); - GridData gd_table = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); - // gd_table.widthHint = 150; - table.setLayoutData(gd_table); + Composite tableComp = new Composite(composite_l, SWT.BORDER); + tableComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); + GridLayout tableLayout = new GridLayout(); + tableLayout.marginHeight = 0; + tableLayout.marginWidth = 0; + tableComp.setLayout(tableLayout); + + table = new Table(tableComp, SWT.FULL_SELECTION | SWT.V_SCROLL); + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); + gd.heightHint = 250; + table.setLayoutData(gd); TableColumn tblclmnNewColumn = new TableColumn(table, SWT.NONE); tblclmnNewColumn.setWidth(160); @@ -125,8 +133,16 @@ public class NewRtProjectWizardPage2 extends WizardPage { lblBoardName.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1)); lblBoardName.setText(Messages.NewArtikProjectWizardPage2_LabelBoardName); - browser = new Browser(composite_r, SWT.BORDER); - browser.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); + Composite browserComp = new Composite(composite_r, SWT.BORDER); + gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); + gd.widthHint = 400; + browserComp.setLayoutData(gd); + FillLayout browserLayout = new FillLayout(); + browserLayout.marginHeight = 0; + browserLayout.marginWidth = 0; + browserComp.setLayout(browserLayout); + + browser = new Browser(browserComp, SWT.NONE); initialize(); dialogChanged(); -- 2.7.4