Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2019-02-26 16:31:50 +0000
committerDani Megert2019-02-26 16:31:50 +0000
commit33ab81d8513fb320fbe759c8b766299f584d5c3f (patch)
treebd5cbdb9c063799d979ba26f7f499dae303b5424
parent01afcdc0fb8782ec7a80728fedb1495e0212ed01 (diff)
downloadeclipse.platform.swt-33ab81d8513fb320fbe759c8b766299f584d5c3f.tar.gz
eclipse.platform.swt-33ab81d8513fb320fbe759c8b766299f584d5c3f.tar.xz
eclipse.platform.swt-33ab81d8513fb320fbe759c8b766299f584d5c3f.zip
Revert "Bug 541415 - setLineVerticalIndent makes getTopPixel fail"
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java3
-rw-r--r--tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java13
2 files changed, 0 insertions, 16 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
index ed4a25ac0c..0de126739e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -9401,9 +9401,6 @@ public void setLineVerticalIndent(int lineIndex, int verticalLineIndent) {
}
setVariableLineHeight();
int oldBottom = getLinePixel(lineIndex + 1);
- if (oldBottom <= getClientArea().height) {
- verticalScrollOffset = -1;
- }
renderer.setLineVerticalIndent(lineIndex, verticalLineIndent);
resetCache(lineIndex, 1);
int newBottom = getLinePixel(lineIndex + 1);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
index bd67ad325f..7306481055 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
@@ -24,8 +24,6 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BidiSegmentListener;
@@ -4825,17 +4823,6 @@ public void test_setTopPixelI(){
}
@Test
-public void test_verticalIndent_changeRelativeBounds() {
- String _5000lines = IntStream.range(1, 5001).mapToObj(n -> Integer.toString(n)).collect(Collectors.joining("\n"));
- text.setText(_5000lines);
- text.setSize(500, 200);
- text.invokeAction(ST.TEXT_END);
- text.setLineVerticalIndent(text.getContent().getLineCount() - 1, 10);
- text.invokeAction(ST.TEXT_START);
- assertEquals(0, text.getTopPixel());
-}
-
-@Test
public void test_setWordWrapZ(){
String testString = "Line1\nLine2";

Back to the top