Attachment 89637 Details for Bug 196447 – A better patch but not perfect

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

[patch] A better patch but not perfect

clipboard.txt (text/plain), 3.03 KB, created by Michael Scharf

on 2008-02-13 09:07:21 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scharf

Created: 2008-02-13 09:07:21 EST

Size: 3.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tm.terminal
>Index: src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java,v
>retrieving revision 1.14
>diff -u -r1.14 VT100TerminalControl.java
>--- src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java	14 Nov 2007 06:15:00 -0000	1.14
>+++ src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java	13 Feb 2008 14:04:49 -0000
>@@ -33,6 +33,7 @@
> 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;
>@@ -508,7 +509,7 @@
> 		// switch to another Workbench control).  We prevent local keyboard input from
> 		// modifying the text in method TerminalVerifyKeyListener.verifyKey().
> 
>-		fWndParent=new Composite(parent,SWT.NONE);
>+		fWndParent=new SashForm(parent,SWT.VERTICAL);
> 		GridLayout layout=new GridLayout();
> 		layout.marginWidth=0;
> 		layout.marginHeight=0;
>@@ -917,8 +918,17 @@
> 		if(fCommandInputField!=null)
> 			fCommandInputField.dispose();
> 		fCommandInputField=inputField;
>-		if(fCommandInputField!=null)
>+		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;
>+				if(hTotal-hTextField>0 && hTextField>0)
>+					((SashForm)fWndParent).setWeights(new int[]{hTotal-hTextField,hTextField});
>+			}
>+		}
> 		if(fWndParent.isVisible())
> 			fWndParent.layout(true);
> 	}
>Index: src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java,v
>retrieving revision 1.7
>diff -u -r1.7 CommandInputFieldWithHistory.java
>--- src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java	22 Jan 2008 22:40:51 -0000	1.7
>+++ src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java	13 Feb 2008 14:04:49 -0000
>@@ -201,7 +201,7 @@
> 		fEditHistoryPos=0;
> 	}
> 	public void createControl(Composite parent,final ITerminalViewControl terminal) {
>-		fInputField=new Text(parent, SWT.SINGLE|SWT.BORDER);
>+		fInputField=new Text(parent, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
> 		GridData data=new GridData(SWT.FILL, SWT.FILL, true, false);
> 		boolean installDecoration=true;
> 		if(installDecoration) {

Actions: View | Diff

Attachments on bug 196447: 89609 | 89637 | 90823