From cce0f45149c1ef8534a962f94310ccc0a05a1bf6 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 9 May 2015 15:44:23 +0000 Subject: [PATCH] Use home screen as landscape backdrop for Achievements and settings --- .../src/forge/screens/achievements/AchievementsScreen.java | 6 ++++++ forge-gui-mobile/src/forge/screens/home/HomeScreen.java | 2 +- .../src/forge/screens/settings/SettingsScreen.java | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java index b3098a3341f..50612d5cf0d 100644 --- a/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java +++ b/forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java @@ -18,6 +18,7 @@ import forge.card.CardZoom; import forge.item.IPaperCard; import forge.menu.FDropDown; import forge.screens.FScreen; +import forge.screens.home.HomeScreen; import forge.toolbox.FComboBox; import forge.toolbox.FEvent; import forge.toolbox.FLabel; @@ -79,6 +80,11 @@ public class AchievementsScreen extends FScreen { trophyCase.setBounds(x, y, width, height - PADDING - y); } + @Override + public FScreen getLandscapeBackdropScreen() { + return HomeScreen.instance; //use home screen as backdrop when in landscape mode + } + private void setAchievements(AchievementCollection achievements0) { trophyCase.achievements = achievements0; trophyCase.selectedAchievement = null; diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java index 30c023593d9..cf3ad1448fa 100644 --- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java @@ -63,7 +63,7 @@ public class HomeScreen extends FScreen { @Override public FScreen getLandscapeBackdropScreen() { return HomeScreen.instance; //use home screen as backdrop when in landscape mode - } + } }; deckManager.setHeaderCaption("Deck Manager"); } diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java index 2cee67ccf4d..36716a0be4f 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java @@ -4,7 +4,9 @@ import forge.Forge; import forge.assets.FSkinColor; import forge.assets.FSkinFont; import forge.assets.FSkinColor.Colors; +import forge.screens.FScreen; import forge.screens.TabPageScreen; +import forge.screens.home.HomeScreen; import forge.util.Utils; public class SettingsScreen extends TabPageScreen { @@ -39,4 +41,9 @@ public class SettingsScreen extends TabPageScreen { public void showMenu() { Forge.back(); //hide settings screen when menu button pressed } + + @Override + public FScreen getLandscapeBackdropScreen() { + return HomeScreen.instance; //use home screen as backdrop when in landscape mode + } }