fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix scroll bar being rendered wrongly (#130)

Browse Source 
* fix scroll bar being rendered wrongly

* tooltip overlap

* fix the first cpu select grid render
This commit is contained in:
Yang Xizhi
2022-08-23 05:43:00 +08:00
committed by GitHub
parent 7714f5196e
commit 55c527e557
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
+10 -11
View File
@@ -179,12 +179,6 @@ public class GuiCraftingStatus extends GuiCraftingCPU
@Override @Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY ) public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
{ {
super.drawFG( offsetX, offsetY, mouseX, mouseY );
if (this.cpuScrollbar != null)
{
this.cpuScrollbar.draw( this );
}
List<CraftingCPUStatus> cpus = this.status.getCPUs(); List<CraftingCPUStatus> cpus = this.status.getCPUs();
final int firstCpu = this.cpuScrollbar.getCurrentScroll(); final int firstCpu = this.cpuScrollbar.getCurrentScroll();
CraftingCPUStatus hoveredCpu = hitCpu( mouseX, mouseY ); CraftingCPUStatus hoveredCpu = hitCpu( mouseX, mouseY );
@@ -278,9 +272,9 @@ public class GuiCraftingStatus extends GuiCraftingCPU
} }
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
} }
StringBuilder tooltip = new StringBuilder();
if( hoveredCpu != null ) if( hoveredCpu != null )
{ {
StringBuilder tooltip = new StringBuilder();
String name = hoveredCpu.getName(); String name = hoveredCpu.getName();
if( name != null && !name.isEmpty() ) if( name != null && !name.isEmpty() )
{ {
@@ -322,10 +316,15 @@ public class GuiCraftingStatus extends GuiCraftingCPU
tooltip.append( hoveredCpu.getCoprocessors() ); tooltip.append( hoveredCpu.getCoprocessors() );
tooltip.append( '\n' ); tooltip.append( '\n' );
} }
if (tooltip.length() > 0) }
{ if (this.cpuScrollbar != null)
this.drawTooltip( mouseX - offsetX, mouseY - offsetY, tooltip.toString() ); {
} this.cpuScrollbar.draw( this );
}
super.drawFG( offsetX, offsetY, mouseX, mouseY );
if (tooltip.length() > 0)
{
this.drawTooltip( mouseX - offsetX, mouseY - offsetY, tooltip.toString() );
} }
} }