upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-13 20:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly sanitized pasted text from trailing spaces at end of line, fixes forced soft-wrap when too many consecutive trailing spaces

Browse Source
This commit is contained in:
bigguy345 committed 2026-02-24 20:18:45 +02:00
1 parent d59d990b70
commit 53f06ab388
2 files changed
+66 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java
+9 -4
View File
@@ -129,6 +129,9 @@ public class GuiScriptTextArea extends GuiNpcTextField {
// ==================== SEARCH/REPLACE ====================
public static final SearchReplaceBar searchBar = new SearchReplaceBar();
// ==================== PASTE SETTINGS ====================
private static final int PASTE_TRAILING_WS_TRIM_THRESHOLD = 16;
// ==================== GO TO LINE ====================
private final GoToLineDialog goToLineDialog = new GoToLineDialog();
@@ -1311,9 +1314,12 @@ public class GuiScriptTextArea extends GuiNpcTextField {
if (!e.isPress() || !isActive.get())
return;
String clipboard = NoppesStringUtils.getClipboardContents();
if (clipboard == null)
clipboard = "";
String clipboardRaw = NoppesStringUtils.getClipboardContents();
if (clipboardRaw == null)
clipboardRaw = "";
boolean isLinePaste = lastCopyWasLine && lastCopiedLineText != null && clipboardRaw.equals(lastCopiedLineText);
String clipboard = FormatHelper.sanitizeClipboard(clipboardRaw, PASTE_TRAILING_WS_TRIM_THRESHOLD);
if (selection.hasSelection()) {
addText(clipboard);
@@ -1323,7 +1329,6 @@ public class GuiScriptTextArea extends GuiNpcTextField {
return;
}
boolean isLinePaste = lastCopyWasLine && lastCopiedLineText != null && clipboard.equals(lastCopiedLineText);
if (isLinePaste && container != null && container.lines != null) {
LineData currentLine = selection.findCurrentLine(container.lines);
if (currentLine != null) {