mirror of
https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git
synced 2026-11-14 01:14:11 +00:00
fix: render interface terminal tooltips above patterns (#1513)
This commit is contained in:
1 parent
83cb720ef1
commit
69e8c1d139
1 file changed
+14
-21
@@ -148,9 +148,9 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||
private List<String> pendingSectionTooltip;
|
||||
private int pendingSectionTooltipX;
|
||||
private int pendingSectionTooltipY;
|
||||
private List<String> pendingHideButtonTooltip;
|
||||
private int pendingHideButtonTooltipX;
|
||||
private int pendingHideButtonTooltipY;
|
||||
private List<String> pendingEntryButtonTooltip;
|
||||
private int pendingEntryButtonTooltipX;
|
||||
private int pendingEntryButtonTooltipY;
|
||||
private final boolean neiPresent;
|
||||
protected static String searchFieldInputsText = "";
|
||||
protected static String searchFieldOutputsText = "";
|
||||
@@ -167,7 +167,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||
private static final float SLOT_Z = 0.5f;
|
||||
private static final float ITEM_STACK_OVERLAY_Z = 200.0f;
|
||||
private static final float SLOT_HOVER_Z = 310.0f;
|
||||
private static final float TOOLTIP_Z = 410.0f;
|
||||
private static final float STEP_Z = 10.0f;
|
||||
private static final float MAGIC_RENDER_ITEM_Z = 50.0f;
|
||||
|
||||
@@ -423,20 +422,20 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||
pendingSectionTooltip = null;
|
||||
}
|
||||
|
||||
if (pendingHideButtonTooltip != null) {
|
||||
if (pendingEntryButtonTooltip != null) {
|
||||
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
|
||||
drawHoveringText(
|
||||
pendingHideButtonTooltip,
|
||||
pendingHideButtonTooltipX,
|
||||
pendingHideButtonTooltipY,
|
||||
pendingEntryButtonTooltip,
|
||||
pendingEntryButtonTooltipX,
|
||||
pendingEntryButtonTooltipY,
|
||||
fontRendererObj);
|
||||
|
||||
GL11.glPopAttrib();
|
||||
pendingHideButtonTooltip = null;
|
||||
pendingEntryButtonTooltip = null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -577,7 +576,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||
GL11.glEnable(GL11.GL_SCISSOR_TEST);
|
||||
|
||||
pendingSectionTooltip = null;
|
||||
pendingHideButtonTooltip = null;
|
||||
pendingEntryButtonTooltip = null;
|
||||
|
||||
/*
|
||||
* Render each section
|
||||
@@ -877,20 +876,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||
if (activeButton.getMouseIn()
|
||||
&& relMouseY >= Math.max(titleBottom - viewY + activeButton.yPosition, activeButton.yPosition)) {
|
||||
if (altHeld) {
|
||||
pendingHideButtonTooltip = buildInterfaceTerminalVisibilityTooltip(entry.hideButton);
|
||||
pendingHideButtonTooltipX = relMouseX + guiLeft + VIEW_LEFT;
|
||||
pendingHideButtonTooltipY = relMouseY + guiTop + HEADER_HEIGHT + 1;
|
||||
pendingEntryButtonTooltip = buildInterfaceTerminalVisibilityTooltip(entry.hideButton);
|
||||
} else if (shiftHeld) {
|
||||
pendingHideButtonTooltip = Collections.singletonList(ButtonToolTips.RenameInterface.getLocal());
|
||||
pendingHideButtonTooltipX = relMouseX + guiLeft + VIEW_LEFT;
|
||||
pendingHideButtonTooltipY = relMouseY + guiTop + HEADER_HEIGHT + 1;
|
||||
pendingEntryButtonTooltip = Collections.singletonList(ButtonToolTips.RenameInterface.getLocal());
|
||||
} else {
|
||||
GL11.glTranslatef(0f, 0f, TOOLTIP_Z);
|
||||
GL11.glDisable(GL11.GL_SCISSOR_TEST);
|
||||
drawHoveringText(extraOptionsText, relMouseX, relMouseY);
|
||||
GL11.glTranslatef(0f, 0f, -TOOLTIP_Z);
|
||||
GL11.glEnable(GL11.GL_SCISSOR_TEST);
|
||||
pendingEntryButtonTooltip = extraOptionsText;
|
||||
}
|
||||
pendingEntryButtonTooltipX = relMouseX + guiLeft + VIEW_LEFT;
|
||||
pendingEntryButtonTooltipY = relMouseY + guiTop + HEADER_HEIGHT + 1;
|
||||
}
|
||||
} else {
|
||||
entry.optionsButton.yPosition = -1;
|
||||
|
||||
Reference in new issue
Block a user