From 55c527e5578f9404e4432110a1aae44894af9c6e Mon Sep 17 00:00:00 2001
From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Date: Tue, 23 Aug 2022 05:43:00 +0800
Subject: [PATCH] fix scroll bar being rendered wrongly (#130)

* fix scroll bar being rendered wrongly

* tooltip overlap

* fix the first cpu select grid render
---
 .../implementations/GuiCraftingStatus.java    | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
index 743e4b751..d07b3ffae 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
@@ -179,12 +179,6 @@ public class GuiCraftingStatus extends GuiCraftingCPU
 	@Override
 	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();
 		final int firstCpu = this.cpuScrollbar.getCurrentScroll();
 		CraftingCPUStatus hoveredCpu = hitCpu( mouseX, mouseY );
@@ -278,9 +272,9 @@ public class GuiCraftingStatus extends GuiCraftingCPU
 			}
 			GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
 		}
+		StringBuilder tooltip = new StringBuilder();
 		if( hoveredCpu != null )
 		{
-			StringBuilder tooltip = new StringBuilder();
 			String name = hoveredCpu.getName();
 			if( name != null && !name.isEmpty() )
 			{
@@ -322,10 +316,15 @@ public class GuiCraftingStatus extends GuiCraftingCPU
 				tooltip.append( hoveredCpu.getCoprocessors() );
 				tooltip.append( '\n' );
 			}
-			if (tooltip.length() > 0)
-			{
-				this.drawTooltip( mouseX - offsetX, mouseY - offsetY, tooltip.toString() );
-			}
+		}
+		if (this.cpuScrollbar != null)
+		{
+			this.cpuScrollbar.draw( this );
+		}
+		super.drawFG( offsetX, offsetY, mouseX, mouseY );
+		if (tooltip.length() > 0)
+		{
+			this.drawTooltip( mouseX - offsetX, mouseY - offsetY, tooltip.toString() );
 		}
 	}