Attachment #89609 for bug #196447

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.events.FocusEvent;

		// switch to another Workbench control).  We prevent local keyboard input from
		// modifying the text in method TerminalVerifyKeyListener.verifyKey().

		fWndParent=new SashForm(parent,SWT.VERTICAL);
		GridLayout layout=new GridLayout();
		layout.marginWidth=0;
		layout.marginHeight=0;

		if(fCommandInputField!=null)
			fCommandInputField.dispose();
		fCommandInputField=inputField;
		if(fCommandInputField!=null) {
			fCommandInputField.createControl(fWndParent, this);
			// if we have a sash form, we have to set the weights
			// TODO remember the weights!
			if(fWndParent.getChildren().length==2 && fWndParent instanceof SashForm) {
				int hTotal=fWndParent.getSize().y;
				int hTextField=fWndParent.getChildren()[1].computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y;
				((SashForm)fWndParent).setWeights(new int[]{hTotal-hTextField,hTextField});
			}
		}
		if(fWndParent.isVisible())
			fWndParent.layout(true);
	}

Lines 201-207 Link Here

(-)src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java (-1 / +1 lines)
201	fEditHistoryPos=0;	201	fEditHistoryPos=0;
202	}	202	}
203	public void createControl(Composite parent,final ITerminalViewControl terminal) {	203	public void createControl(Composite parent,final ITerminalViewControl terminal) {
204	fInputField=new Text(parent, SWT.SINGLE\|SWT.BORDER);	204	fInputField=new Text(parent, SWT.MULTI\|SWT.BORDER\|SWT.WRAP\|SWT.V_SCROLL);
205	GridData data=new GridData(SWT.FILL, SWT.FILL, true, false);	205	GridData data=new GridData(SWT.FILL, SWT.FILL, true, false);
206	boolean installDecoration=true;	206	boolean installDecoration=true;
207	if(installDecoration) {	207	if(installDecoration) {

Return to bug 196447

Lines 33-38 Link Here

(-)src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java (-2 / +11 lines)
33	import org.eclipse.jface.resource.JFaceResources;	33	import org.eclipse.jface.resource.JFaceResources;
34	import org.eclipse.osgi.util.NLS;	34	import org.eclipse.osgi.util.NLS;
35	import org.eclipse.swt.SWT;	35	import org.eclipse.swt.SWT;
		36	import org.eclipse.swt.custom.SashForm;
36	import org.eclipse.swt.dnd.Clipboard;	37	import org.eclipse.swt.dnd.Clipboard;
37	import org.eclipse.swt.dnd.TextTransfer;	38	import org.eclipse.swt.dnd.TextTransfer;
38	import org.eclipse.swt.events.FocusEvent;	39	import org.eclipse.swt.events.FocusEvent;
Lines 508-514 Link Here
508	// switch to another Workbench control). We prevent local keyboard input from	509	// switch to another Workbench control). We prevent local keyboard input from
509	// modifying the text in method TerminalVerifyKeyListener.verifyKey().	510	// modifying the text in method TerminalVerifyKeyListener.verifyKey().
510		511
511	fWndParent=new Composite(parent,SWT.NONE);	512	fWndParent=new SashForm(parent,SWT.VERTICAL);
512	GridLayout layout=new GridLayout();	513	GridLayout layout=new GridLayout();
513	layout.marginWidth=0;	514	layout.marginWidth=0;
514	layout.marginHeight=0;	515	layout.marginHeight=0;
Lines 917-924 Link Here
917	if(fCommandInputField!=null)	918	if(fCommandInputField!=null)
918	fCommandInputField.dispose();	919	fCommandInputField.dispose();
919	fCommandInputField=inputField;	920	fCommandInputField=inputField;
920	if(fCommandInputField!=null)	921	if(fCommandInputField!=null) {
921	fCommandInputField.createControl(fWndParent, this);	922	fCommandInputField.createControl(fWndParent, this);
		923	// if we have a sash form, we have to set the weights
		924	// TODO remember the weights!
		925	if(fWndParent.getChildren().length==2 && fWndParent instanceof SashForm) {
		926	int hTotal=fWndParent.getSize().y;
		927	int hTextField=fWndParent.getChildren()[1].computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y;
		928	((SashForm)fWndParent).setWeights(new int[]{hTotal-hTextField,hTextField});
		929	}
		930	}
922	if(fWndParent.isVisible())	931	if(fWndParent.isVisible())
923	fWndParent.layout(true);	932	fWndParent.layout(true);
924	}	933	}