From 67a599a89279f9c3d6ebc726fe1767a8a7bfa36b Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 1 Aug 2022 05:04:09 +0800 Subject: [PATCH] update dimension --- forge-gui-mobile/src/forge/adventure/scene/RewardScene.java | 6 ++++-- forge-gui-mobile/src/forge/adventure/util/RewardActor.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java index 7668a4d39b0..73e548af27b 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java @@ -216,9 +216,11 @@ public class RewardScene extends UIScene { float fW = Forge.isLandscapeMode() ? Forge.getScreenWidth() : Forge.getScreenHeight(); float fH = Forge.isLandscapeMode() ? Forge.getScreenHeight() : Forge.getScreenWidth(); float mul = fW/fH < AR ? AR/(fW/fH) : (fW/fH)/AR; - if (fW/fH >= 2) {//tall display + if (fW/fH >= 2f) {//tall display mul = (fW/fH) - ((fW/fH)/AR); - if ((fW/fH) > 2.3) //ultrawide 21:9 Galaxy Fold, Huawei X2, Xperia 1 + if ((fW/fH) >= 2.1f && (fW/fH) < 2.3f) + mul *= 0.9f; + else if ((fW/fH) > 2.3) //ultrawide 21:9 Galaxy Fold, Huawei X2, Xperia 1 mul *= 0.8f; } cardHeight = bestCardHeight * 0.90f ; diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java index 8725d3af58c..1bf9f310c9d 100644 --- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java +++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java @@ -352,9 +352,11 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb float fW = Forge.isLandscapeMode() ? Forge.getScreenWidth() : Forge.getScreenHeight(); float fH = Forge.isLandscapeMode() ? Forge.getScreenHeight() : Forge.getScreenWidth(); float mul = fW/fH < AR ? AR/(fW/fH) : (fW/fH)/AR; - if (fW/fH >= 2) {//tall display + if (fW/fH >= 2f) {//tall display mul = (fW/fH) - ((fW/fH)/AR); - if ((fW/fH) > 2.3) //ultrawide 21:9 Galaxy Fold, Huawei X2, Xperia 1 + if ((fW/fH) >= 2.1f && (fW/fH) < 2.3f) + mul *= 0.9f; + else if ((fW/fH) > 2.3) //ultrawide 21:9 Galaxy Fold, Huawei X2, Xperia 1 mul *= 0.8f; } if (Forge.isLandscapeMode())