diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java index 3e9432b100c..5a85f31ad35 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/PageBook.java @@ -41,7 +41,7 @@ public class PageBook extends Composite { int y = minimumPageSize.y; Control[] children = composite.getChildren(); for (int i = 0; i < children.length; i++) { - Point size = children[i].computeSize(SWT.DEFAULT, SWT.DEFAULT, force); + Point size = children[i].computeSize(wHint, hHint, force); x = Math.max(x, size.x); y = Math.max(y, size.y); } @@ -59,7 +59,7 @@ public class PageBook extends Composite { Rectangle rect = composite.getClientArea(); Control[] children = composite.getChildren(); for (int i = 0; i < children.length; i++) { - children[i].setSize(rect.width, rect.height); + children[i].setBounds(rect); } } } @@ -75,8 +75,10 @@ public class PageBook extends Composite { * @param parent the parent composite * @param style the SWT style bits (use {@link SWT#NONE}) */ - public PageBook(Composite parent, int style) { + public PageBook(Composite parent, int style, int minWidth, int minHeight) { super(parent, style); + minimumPageSize.x=minWidth; + minimumPageSize.y=minHeight; setLayout(new PageBookLayout()); } diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java index 54ca7d017d0..b0b152e4fb7 100644 --- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java +++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalSettingsDlg.java @@ -116,13 +116,13 @@ class TerminalSettingsDlg extends Dialog { } private void setupSettingsGroup(Composite parent) { Group group = new Group(parent, SWT.NONE); - GridLayout gridLayout = new GridLayout(); - GridData gridData = new GridData(GridData.FILL_BOTH); - group.setText(ViewMessages.SETTINGS + ":"); //$NON-NLS-1$ - group.setLayout(gridLayout); - group.setLayoutData(gridData); - fPageBook=new PageBook(group,SWT.NONE); + group.setLayout(new GridLayout()); + group.setLayoutData(new GridData(GridData.FILL_BOTH)); + fPageBook=new PageBook(group,SWT.NONE,230,0); + fPageBook.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + for (int i = 0; i < fPages.length; i++) { fPages[i].createControl(fPageBook); }