From ca389b2ffe1cd95d88df791492f08f02b2fc885b Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 9 May 2015 23:20:06 +0000
Subject: [PATCH] Start working on getting drop down menus to show down right
 side

---
 .../src/forge/screens/FScreen.java            | 30 +++++++++++++++----
 .../forge/screens/quest/LoadQuestScreen.java  |  3 +-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/FScreen.java b/forge-gui-mobile/src/forge/screens/FScreen.java
index f618bc46bc9..73811430f0b 100644
--- a/forge-gui-mobile/src/forge/screens/FScreen.java
+++ b/forge-gui-mobile/src/forge/screens/FScreen.java
@@ -185,7 +185,6 @@ public abstract class FScreen extends FContainer {
                     Forge.back();
                 }
             }).build());
-            btnBack.setSize(HEIGHT, HEIGHT);
             lblCaption = add(new FLabel.Builder().text(headerCaption).font(FONT).align(HAlignment.CENTER).build());
         }
 
@@ -201,43 +200,64 @@ public abstract class FScreen extends FContainer {
 
         @Override
         public void drawBackground(Graphics g) {
-            g.fillRect(BACK_COLOR, 0, 0, getWidth(), HEIGHT);
+            g.fillRect(BACK_COLOR, 0, 0, getWidth(), getHeight());
         }
 
         @Override
         public void drawOverlay(Graphics g) {
+            if (Forge.isLandscapeMode()) {
+                //in landscape mode, draw left border for header
+                g.drawLine(LINE_THICKNESS, LINE_COLOR, 0, 0, 0, getHeight());
+                return;
+            }
             float y = HEIGHT - LINE_THICKNESS / 2;
             g.drawLine(LINE_THICKNESS, LINE_COLOR, 0, y, getWidth(), y);
         }
 
         @Override
         protected void doLayout(float width, float height) {
+            if (Forge.isLandscapeMode()) {
+                //in landscape mode, don't show back button or caption
+                btnBack.setBounds(0, 0, 0, 0);
+                lblCaption.setBounds(0, 0, 0, 0);
+                return;
+            }
+            btnBack.setBounds(0, 0, height, height);
             lblCaption.setBounds(height, 0, width - 2 * height, height);
         }
     }
     private static class MenuHeader extends DefaultHeader {
         private final FLabel btnMenu;
+        private final FPopupMenu menu;
 
-        public MenuHeader(String headerCaption, final FPopupMenu menu) {
+        public MenuHeader(String headerCaption, FPopupMenu menu0) {
             super(headerCaption);
+            menu = menu0;
             btnMenu = add(new FLabel.Builder().icon(new MenuIcon(HEIGHT, HEIGHT)).pressedColor(BTN_PRESSED_COLOR).align(HAlignment.CENTER).command(new FEventHandler() {
                 @Override
                 public void handleEvent(FEvent e) {
                     menu.show(btnMenu, 0, HEIGHT);
                 }
             }).build());
-            btnMenu.setSize(HEIGHT, HEIGHT);
         }
 
         @Override
         protected void doLayout(float width, float height) {
             super.doLayout(width, height);
-            btnMenu.setLeft(width - height);
+
+            if (Forge.isLandscapeMode()) {
+                //for landscape mode, hide menu button and display menu
+                btnMenu.setBounds(0, 0, 0, 0);
+                return;
+            }
+
+            btnMenu.setBounds(width - height, 0, height, height);
         }
 
         @Override
         public float doLandscapeLayout(float screenWidth, float screenHeight) {
             float width = screenHeight * HomeScreen.MAIN_MENU_WIDTH_FACTOR;
+            setBounds(screenWidth - width, 0, width, screenHeight);
             return width;
         }
     }
diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
index 81c82546b9d..a0c0929bcfd 100644
--- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
@@ -13,6 +13,7 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
 
 import forge.FThreads;
+import forge.Forge;
 import forge.Graphics;
 import forge.assets.FSkinColor;
 import forge.assets.FSkinColor.Colors;
@@ -142,7 +143,7 @@ public class LoadQuestScreen extends LaunchScreen {
     @Override
     protected void drawBackground(Graphics g) {
         super.drawBackground(g);
-        float y = getHeader().getBottom();
+        float y = Forge.isLandscapeMode() ? 0 : getHeader().getBottom();
         g.fillRect(OLD_QUESTS_BACK_COLOR, 0, y, lstQuests.getWidth(), lstQuests.getTop() - y);
     }