diff options
| author | Moulberry <jjenour@student.unimelb.edu.au> | 2021-06-04 08:53:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 08:53:31 +0000 |
| commit | 87e44e6a9443b51016964a94254875cb9761a604 (patch) | |
| tree | 20ea6e04aa613a14bdf01192b20f84ff7a60099a /src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java | |
| parent | a1fa5a67caebf754a0fcc43168672823ede0db93 (diff) | |
| parent | eeb5c45d71997cb259fc35330490a19db7865603 (diff) | |
| download | notenoughupdates-87e44e6a9443b51016964a94254875cb9761a604.tar.gz notenoughupdates-87e44e6a9443b51016964a94254875cb9761a604.tar.bz2 notenoughupdates-87e44e6a9443b51016964a94254875cb9761a604.zip | |
Merge pull request #191 from carelesshippo/master
Reopened with merge conflicts resolved
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index 895567b4..ddef0828 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import io.github.moulberry.notenoughupdates.auction.CustomAHGui; import io.github.moulberry.notenoughupdates.core.BackgroundBlur; import io.github.moulberry.notenoughupdates.core.GuiScreenElementWrapper; import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingInteger; @@ -1370,7 +1371,7 @@ public class NEUOverlay extends Gui { public float getWidthMult() { float scaleFMult = 1; if(Utils.peekGuiScale().getScaleFactor()==4) scaleFMult *= 0.9f; - if(manager.auctionManager.customAH.isRenderOverAuctionView()) scaleFMult *= 0.8f; + if(manager.auctionManager.customAH.isRenderOverAuctionView() || Minecraft.getMinecraft().currentScreen instanceof CustomAHGui) scaleFMult *= 0.8f; return (float)Math.max(0.5, Math.min(1.5, NotEnoughUpdates.INSTANCE.config.itemlist.paneWidthMult))*scaleFMult; } |