From beca83a97c7defdd92c78d6662a73afbcf830ff0 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 4 Aug 2022 11:00:33 +0800 Subject: [PATCH] adjust tooltips for screens without navigation menu --- .../src/forge/adventure/scene/RewardScene.java | 7 +++++++ .../src/forge/adventure/util/RewardActor.java | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java index f1fab39920a..b5912a19fe5 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java @@ -230,6 +230,13 @@ public class RewardScene extends UIScene { cardHeight = bestCardHeight * 0.90f ; if (realX > x || realY > y) { mul *= Forge.isLandscapeMode() ? 0.95f : 1.05f; + } else { + //immersive | no navigation and/or showing cutout cam + if (fW/fH > 2.3f) + mul *= Forge.isLandscapeMode() ? 1.1f : 1.5f; + else if (fW/fH > 2f) + mul *= Forge.isLandscapeMode() ? 1.1f : 1.3f; + } cardWidth = (cardHeight / CARD_WIDTH_TO_HEIGHT)*mul; diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java index e19d9aa93ee..3ae92a9647a 100644 --- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java +++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java @@ -353,13 +353,21 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb int y = Forge.getDeviceAdapter().getRealScreenSize(false).getRight(); int realX = Forge.getDeviceAdapter().getRealScreenSize(true).getLeft(); int realY = Forge.getDeviceAdapter().getRealScreenSize(true).getRight(); + float fW = x > y ? x : y; + float fH = x > y ? y : x; if (realX > x) { x *= 1.1f; } else if (realY > y) { y *= 1.1f; + } else { + if (fW/fH > 2f) { + //immersive | no navigation and showing cutout cam + if (Forge.isLandscapeMode()) + x *= 1.3f; + else + y *= 1.5f; + } } - float fW = x > y ? x : y; - float fH = x > y ? y : x; float mul = fW/fH < AR ? AR/(fW/fH) : (fW/fH)/AR; if (fW/fH >= 2f) {//tall display mul = (fW/fH) - ((fW/fH)/AR);