From: Timo Mueller <[email protected]> The layout of the parent composite is set in every yocto settings element. Depending on the order in which the elements are added to the composite this may lead to different layouts being used.
Layout of the composite is now set in the preference/property pages instead of setting this in every child component. Signed-off-by: Timo Mueller <[email protected]> --- .../org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProfileSetting.java | 1 - .../src/org/yocto/sdk/ide/YoctoProjectSpecificSetting.java | 1 - plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java | 1 - .../src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java | 2 ++ .../src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java | 2 ++ 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProfileSetting.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProfileSetting.java index 0f36e99..f56fea4 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProfileSetting.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProfileSetting.java @@ -60,7 +60,6 @@ public class YoctoProfileSetting { public void createComposite(Composite composite) { GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); GridLayout layout = new GridLayout(2, false); - composite.setLayout(layout); Group storeYoctoConfigurationsGroup = new Group (composite, SWT.NONE); layout = new GridLayout(1, false); diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProjectSpecificSetting.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProjectSpecificSetting.java index 13acb8e..2a55a64 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProjectSpecificSetting.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoProjectSpecificSetting.java @@ -41,7 +41,6 @@ public class YoctoProjectSpecificSetting { public void createComposite(Composite composite) { GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); GridLayout layout = new GridLayout(2, false); - composite.setLayout(layout); Group storeYoctoConfigurationsGroup = new Group (composite, SWT.NONE); layout = new GridLayout(2, false); diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java index f27019d..3aa38d9 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoUISetting.java @@ -184,7 +184,6 @@ public class YoctoUISetting { { GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false); GridLayout layout = new GridLayout(2, false); - composite.setLayout(layout); Group crossCompilerGroup= new Group(composite, SWT.NONE); layout= new GridLayout(2, false); diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java index 1a8c8ca..97c602b 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKPreferencePage.java @@ -22,6 +22,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; @@ -76,6 +77,7 @@ public class YoctoSDKPreferencePage extends PreferencePage implements IWorkbench protected Control createContents(Composite parent) { initializeDialogUnits(parent); final Composite composite= new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout(2, false)); yoctoProfileSetting.createComposite(composite); yoctoUISetting.createComposite(composite); diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java index ca148af..effd432 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/preferences/YoctoSDKProjectPropertyPage.java @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbenchPropertyPage; @@ -64,6 +65,7 @@ public class YoctoSDKProjectPropertyPage extends PropertyPage implements initializeDialogUnits(parent); final Composite composite = new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout(2, false)); yoctoProfileSetting.createComposite(composite); yoctoProjectSpecificSetting.createComposite(composite); -- 1.7.11.7 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
