Skip to content

fixed disjoint text selection when using left click to select text in the editor #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.19.2
Choose a base branch
from
Open

fixed disjoint text selection when using left click to select text in the editor #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 67 additions & 10 deletions src/main/java/ca/teamdman/sfm/client/screen/text_editor/SFMTextEditScreenV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.Style;
import net.minecraft.util.Mth;
import org.jetbrains.annotations.Nullable;
import org.lwjgl.glfw.GLFW;

Expand Down Expand Up @@ -440,9 +441,17 @@ public boolean mouseClicked(
int button
) {
try {
// if mouse in bounds, translate to accommodate line numbers
if (mx >= this.x + 1 && mx <= this.x + this.width - 1) {
mx -= getLineNumberWidth();
if (button == 0 && this.visible && this.withinContentAreaPoint(mx, my)) {
if (lastProgramWithSyntaxHighlighting.isEmpty()) {
return false;
}
boolean selecting = Screen.hasShiftDown();
this.textField.setSelecting(selecting);
seekCursorFromPoint(mx, my);
if (!selecting) {
this.textField.selectCursor = this.textField.cursor;
}
return true;
}
return super.mouseClicked(mx, my, button);
} catch (Exception e) {
Expand All @@ -466,6 +475,24 @@ public boolean mouseDragged(
double dx,
double dy
) {
try {
if (button == 0 && this.visible && this.withinContentAreaPoint(mx, my)) {
if (lastProgramWithSyntaxHighlighting.isEmpty()) {
return false;
}
boolean shiftDown = Screen.hasShiftDown();
this.textField.setSelecting(true);
seekCursorFromPoint(mx, my);
this.textField.setSelecting(shiftDown);
if (!shiftDown) {
this.textField.selectCursor = this.textField.cursor;
}
return true;
}
} catch (Exception e) {
SFM.LOGGER.error("Error in SFMTextEditScreenV1.MyMultiLineEditBox.mouseDragged", e);
return false;
}
// if mouse in bounds, translate to accommodate line numbers
int thisX = SFMScreenRenderUtils.getX(this);
if (mx >= thisX + 1 && mx <= thisX + this.width - 1) {
Expand All @@ -479,6 +506,32 @@ public int getSelectionCursorPosition() {
return this.textField.selectCursor;
}

private void seekCursorFromPoint(double mx, double my) {
double innerX = mx - (this.x + this.innerPadding() + getLineNumberWidth());
double innerY = my - (this.y + this.innerPadding()) + this.scrollAmount();
int lineHeight = this.font.lineHeight;
int lineIndex = Mth.clamp((int) Math.floor(innerY / lineHeight), 0, lastProgramWithSyntaxHighlighting.size() - 1);
int lineStartIndex = getLineStartIndex(lineIndex);
String plainLine = lastProgramWithSyntaxHighlighting.get(lineIndex).getString();
int clampedX = (int) Math.max(0, innerX);
int cursorOffsetInLine = this.font.plainSubstrByWidth(plainLine, clampedX).length();
int cursorPosition = Mth.clamp(lineStartIndex + cursorOffsetInLine, 0, this.textField.value().length());
this.textField.seekCursor(Whence.ABSOLUTE, cursorPosition);
}

private int getLineStartIndex(int lineIndex) {
String value = this.textField.value();
int index = 0;
for (int i = 0; i < lineIndex && index < value.length(); i++) {
int newline = value.indexOf('\n', index);
if (newline == -1) {
return value.length();
}
index = newline + 1;
}
return index;
}

public void setSelectionCursorPosition(int cursor) {
this.textField.selectCursor = cursor;
}
Expand Down Expand Up @@ -593,7 +646,8 @@ protected void renderContents(

for (int line = 0; line < lines.size(); ++line) {
var componentColoured = lines.get(line);
int lineLength = componentColoured.getString().length();
String plainLine = componentColoured.getString();
int lineLength = plainLine.length();
int lineHeight = this.font.lineHeight;
boolean cursorOnThisLine = isCursorVisible
&& cursorIndex >= charCount
Expand All @@ -619,21 +673,24 @@ protected void renderContents(
if (cursorOnThisLine) {
isCursorAtEndOfLine = cursorIndex == charCount + lineLength;
cursorY = lineY;
int relativeCursorIndex = cursorIndex - charCount;
int drawnWidthBeforeCursor = this.font.width(plainLine.substring(0, relativeCursorIndex));
cursorX = lineX + drawnWidthBeforeCursor;
// draw text before cursor
cursorX = SFMFontUtils.drawInBatch(
substring(componentColoured, 0, cursorIndex - charCount),
SFMFontUtils.drawInBatch(
substring(componentColoured, 0, relativeCursorIndex),
font,
lineX,
lineY,
true,
false,
matrix4f,
buffer
) - 1;
);
SFMTextEditScreenV1.this.suggestedActions.setXY(cursorX + 10, cursorY);
// draw text after cursor
SFMFontUtils.drawInBatch(
substring(componentColoured, cursorIndex - charCount, lineLength),
substring(componentColoured, relativeCursorIndex, lineLength),
font,
cursorX,
lineY,
Expand Down Expand Up @@ -661,8 +718,8 @@ protected void renderContents(
int lineSelectionStart = Math.max(selectionStart - charCount, 0);
int lineSelectionEnd = Math.min(selectionEnd - charCount, lineLength);

int highlightStartX = this.font.width(substring(componentColoured, 0, lineSelectionStart));
int highlightEndX = this.font.width(substring(componentColoured, 0, lineSelectionEnd));
int highlightStartX = this.font.width(plainLine.substring(0, lineSelectionStart));
int highlightEndX = this.font.width(plainLine.substring(0, lineSelectionEnd));

SFMScreenRenderUtils.renderHighlight(
poseStack,
Expand Down