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

Fixed various formatting line wrap bugs

Browse Source
This commit is contained in:
bigguy345 committed 2026-03-11 10:53:32 +02:00
1 parent 28b8cda4cf
commit 57128a8d8b
4 files changed
+350 -30
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
+8 -4
View File
@@ -2088,7 +2088,9 @@ public class GuiScriptTextArea extends GuiNpcTextField {
if (closeLineIdx < this.container.lines.size()) {
int closeIndent = IndentHelper.getLineIndent(
this.container.lines.get(closeLineIdx).text);
if (closeIndent == indent.length()) {
// <= handles multi-line declarations where '{' sits on a
// continuation line with higher indent than the closing '}'
if (closeIndent <= indent.length()) {
hasMatchingClose = true;
}
}
@@ -2940,9 +2942,11 @@ public class GuiScriptTextArea extends GuiNpcTextField {
}
private void formatText() {
// Calculate viewport width for line wrapping (account for gutter and scrollbar)
int viewportWidth = this.width - LINE_NUMBER_GUTTER_WIDTH - 10;
IndentHelper.FormatResult result = IndentHelper.formatText(text, selection.getCursorPosition(), viewportWidth);
int viewportPixels = this.width - LINE_NUMBER_GUTTER_WIDTH - 10;
int avgCharWidth = Math.max(1, ClientProxy.Font.width("abcdefghijklmnopqrstuvwxyz") / 26);
int viewportChars = (int) (viewportPixels * 0.8f / avgCharWidth);
int maxLineLength = Math.max(60, Math.min(viewportChars, 120));
IndentHelper.FormatResult result = IndentHelper.formatText(text, selection.getCursorPosition(), maxLineLength);
setText(result.text);
selection.reset(Math.max(0, Math.min(result.cursorPosition, this.text.length())));
}