From 9255afc91cddcabcc16b1ca7bb251439d0c24792 Mon Sep 17 00:00:00 2001 From: arm32x Date: Fri, 6 Oct 2023 12:08:35 -0400 Subject: [PATCH] Make text fields render at the correct size again --- .../client/gui/MultilineTextFieldWidget.java | 2 +- .../client/gui/editor/CommandEditor.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/arm32x/minecraft/commandblockide/client/gui/MultilineTextFieldWidget.java b/src/main/java/arm32x/minecraft/commandblockide/client/gui/MultilineTextFieldWidget.java index 4e617cd..a52f41a 100644 --- a/src/main/java/arm32x/minecraft/commandblockide/client/gui/MultilineTextFieldWidget.java +++ b/src/main/java/arm32x/minecraft/commandblockide/client/gui/MultilineTextFieldWidget.java @@ -281,7 +281,7 @@ public void renderButton(DrawContext context, int mouseX, int mouseY, float delt int textColor = self.isEditable() ? self.getEditableColor() : self.getUneditableColor(); int x = this.getX() + (self.getDrawsBackground() ? 4 : 0) - horizontalScroll; - int y = this.getY() + (self.getDrawsBackground() ? 3 : 0) - verticalScroll; + int y = this.getY() + (self.getDrawsBackground() ? 4 : 0) - verticalScroll; long timeSinceLastSwitchFocusMs = Util.getMeasuringTimeMs() - self.getLastSwitchFocusTime(); boolean showCursor = isFocused() && timeSinceLastSwitchFocusMs / CURSOR_BLINK_INTERVAL_MS % 2 == 0; diff --git a/src/main/java/arm32x/minecraft/commandblockide/client/gui/editor/CommandEditor.java b/src/main/java/arm32x/minecraft/commandblockide/client/gui/editor/CommandEditor.java index 4bce91f..5e6da97 100644 --- a/src/main/java/arm32x/minecraft/commandblockide/client/gui/editor/CommandEditor.java +++ b/src/main/java/arm32x/minecraft/commandblockide/client/gui/editor/CommandEditor.java @@ -76,8 +76,8 @@ public CommandEditor(Screen screen, TextRenderer textRenderer, int x, int y, int commandField = addSelectableChild(new MultilineTextFieldWidget( textRenderer, - x + leftPadding + 20 + 1, y + 1, - width - leftPadding - rightPadding - 20 - 2, height - 2, + x + leftPadding + 20, y, + width - leftPadding - rightPadding - 20, height, Text.translatable("advMode.command") .append(Text.translatable("commandBlockIDE.narrator.editorIndex", index + 1)) ) { @@ -241,7 +241,7 @@ public int getY() { public void setY(int y) { this.y = y; - commandField.setY(y + 1); + commandField.setY(y); suggestor.refresh(); } @@ -253,7 +253,7 @@ public int getWidth() { public void setWidth(int width) { this.width = width; - commandField.setWidth(width - leftPadding - rightPadding - 20 - 2); + commandField.setWidth(width - leftPadding - rightPadding - 20); suggestor.refresh(); } @@ -266,7 +266,7 @@ public void setHeight(int height) { boolean changed = height != this.height; this.height = height; - commandField.setHeight(height - 2); + commandField.setHeight(height); suggestor.refresh();