Skip to content

Commit 38aebfc

Browse files
committed
make tooltips max width just a little smaller & allow search query to match ActionController value text
1 parent de1c8a3 commit 38aebfc

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/main/java/dev/isxander/yacl/gui/OptionListWidget.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import net.minecraft.util.math.MathHelper;
2020
import org.jetbrains.annotations.Nullable;
2121

22-
import java.util.ArrayList;
23-
import java.util.List;
24-
import java.util.Objects;
22+
import java.util.*;
2523
import java.util.function.Supplier;
2624

2725
public class OptionListWidget extends ElementListWidget<OptionListWidget.Entry> {
@@ -310,7 +308,7 @@ private GroupSeparatorEntry(OptionGroup group, Screen screen) {
310308
this.group = group;
311309
this.screen = screen;
312310
this.wrappedName = MultilineText.create(textRenderer, group.name(), getRowWidth() - 45);
313-
this.wrappedTooltip = MultilineText.create(textRenderer, group.tooltip(), screen.width / 3 * 2);
311+
this.wrappedTooltip = MultilineText.create(textRenderer, group.tooltip(), screen.width / 3 * 2 - 10);
314312
this.groupExpanded = !group.collapsed();
315313
this.expandMinimizeButton = new LowProfileButtonWidget(0, 0, 20, 20, Text.empty(), btn -> {
316314
setExpanded(!isExpanded());

src/main/java/dev/isxander/yacl/gui/TooltipButtonWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ public void renderHoveredTooltip(MatrixStack matrices) {
2525
}
2626

2727
public void setTooltip(Text tooltip) {
28-
wrappedDescription = MultilineText.create(MinecraftClient.getInstance().textRenderer, tooltip, screen.width / 3);
28+
wrappedDescription = MultilineText.create(MinecraftClient.getInstance().textRenderer, tooltip, screen.width / 3 - 5);
2929
}
3030
}

src/main/java/dev/isxander/yacl/gui/controllers/ActionController.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,10 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
105105
protected int getHoveredControlWidth() {
106106
return getUnhoveredControlWidth();
107107
}
108+
109+
@Override
110+
public boolean matchesSearch(String query) {
111+
return super.matchesSearch(query) || getValueText().getString().toLowerCase().contains(query);
112+
}
108113
}
109114
}

src/main/java/dev/isxander/yacl/gui/controllers/ControllerWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public boolean isMouseOver(double mouseX, double mouseY) {
8181
}
8282

8383
private void updateTooltip() {
84-
this.wrappedTooltip = MultilineText.create(textRenderer, control.option().tooltip(), screen.width / 3 * 2);
84+
this.wrappedTooltip = MultilineText.create(textRenderer, control.option().tooltip(), screen.width / 3 * 2 - 10);
8585
}
8686

8787
protected int getControlWidth() {

0 commit comments

Comments
 (0)