mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 22:22:11 +02:00
Code Issues Wiki Activity

Terminal: Fix Bug 425757 - Command line is disarranged

Browse source 
This commit rolls back the commit
faa1188866 which changed the layout to use
a FillLayout. As this is fixing an issue with a horizontal scrollbar
painted on Linux where it is not needed, it leads to more serious issues
on Windows. Rolling back the commit is addressing the immediate need of
getting the layout fixed where the scrollbar issue is somewhat
cosmetical.
This commit is contained in:
Uwe Stieber 2014-01-28 13:29:22 +01:00
parent ff7e6aa3fa
commit 543c0b95eb
7 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
features/org.eclipse.tm.terminal-feature/feature.xml
View file

@ -13,7 +13,7 @@
<feature
id="org.eclipse.tm.terminal"
label="%featureName"
version="3.2.100.qualifier"
version="3.2.200.qualifier"
provider-name="%providerName">
<description>

2
features/org.eclipse.tm.terminal-feature/pom.xml
View file

@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.tm.features</groupId>
<artifactId>org.eclipse.tm.terminal</artifactId>
<version>3.2.100.qualifier</version>
<version>3.2.200.qualifier</version>
<packaging>eclipse-feature</packaging>
</project>

2
features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
View file

@ -12,7 +12,7 @@
<feature
id="org.eclipse.tm.terminal.core.sdk"
label="%featureName"
version="3.3.100.qualifier"
version="3.3.200.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">

2
features/org.eclipse.tm.terminal.sdk-feature/feature.xml
View file

@ -13,7 +13,7 @@
<feature
id="org.eclipse.tm.terminal.sdk"
label="%featureName"
version="3.3.100.qualifier"
version="3.3.200.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">

2
plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
Bundle-Version: 3.2.100.qualifier
Bundle-Version: 3.2.200.qualifier
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin

2
plugins/org.eclipse.tm.terminal/pom.xml
View file

@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.tm</groupId>
<artifactId>org.eclipse.tm.terminal</artifactId>
<version>3.2.100.qualifier</version>
<version>3.2.200.qualifier</version>
<packaging>eclipse-plugin</packaging>
</project>

7
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
View file

@ -65,7 +65,8 @@ import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@ -672,7 +673,8 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
// modifying the text in method TerminalVerifyKeyListener.verifyKey().
fWndParent=new Composite(parent,SWT.NONE);
FillLayout layout=new FillLayout();
GridLayout layout=new GridLayout();
layout.marginWidth=0; layout.marginHeight=0; layout.verticalSpacing=0;
fWndParent.setLayout(layout);
ITerminalTextDataSnapshot snapshot=fTerminalModel.makeSnapshot();
@ -681,6 +683,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
ITextCanvasModel canvasModel=new PollingTextCanvasModel(snapshot);
fCtlText=new TextCanvas(fWndParent,canvasModel,SWT.NONE,new TextLineRenderer(fCtlText,canvasModel));
fCtlText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
fCtlText.addResizeHandler(new TextCanvas.ResizeListener() {
public void sizeChanged(int lines, int columns) {
fTerminalText.setDimensions(lines, columns);