Skip to content

Commit 1a1f0c2

Browse files
N1k145HeikoKlare
authored andcommitted
Fixes NPE in StyledText on DPI Resizing
fixes #2320
1 parent ac52a23 commit 1a1f0c2

File tree

1 file changed

+5
-3
lines changed
  • bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom

1 file changed

+5
-3
lines changed

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10879,10 +10879,12 @@ public static void updateAndRefreshCarets(StyledText styledText, Consumer<Caret>
1087910879
Set<Caret> caretSet = new HashSet<>();
1088010880
caretSet.add(styledText.getCaret());
1088110881
caretSet.add(styledText.defaultCaret);
10882-
for (Caret caret : styledText.carets) {
10883-
caretSet.add(caret);
10882+
if (styledText.carets != null) {
10883+
for (Caret caret : styledText.carets) {
10884+
caretSet.add(caret);
10885+
}
1088410886
}
10885-
caretSet.forEach(caretUpdater);
10887+
caretSet.stream().filter(Objects::nonNull).forEach(caretUpdater);
1088610888

1088710889
styledText.updateCaretVisibility();
1088810890
styledText.setCaretLocations();

0 commit comments

Comments
 (0)