From 059e7f7920c85adc2f2bdd04cfee43048b81f7e7 Mon Sep 17 00:00:00 2001 From: drdev Date: Thu, 30 Jan 2014 01:58:49 +0000 Subject: [PATCH] Fix so first player's avatar has focus when Forge first opened --- .../gui/home/sanctioned/VSubmenuConstructed.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index dd6adffdaef..99b48564cae 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -197,6 +197,7 @@ public enum VSubmenuConstructed implements IVSubmenu { } playerPanelWithFocus = playerPanels.get(0); + playerPanelWithFocus.setFocused(true); playersFrame.setOpaque(false); playersFrame.add(playersScroll, "w 100%, h 100%-35px"); @@ -396,7 +397,7 @@ public enum VSubmenuConstructed implements IVSubmenu { fdc.getDecksComboBox().addListener(new IDecksComboBoxListener() { @Override public void deckTypeSelected(DecksComboBoxEvent ev) { - playerPanels.get(playerWithFocus).focusOnAvatar(); + playerPanelWithFocus.focusOnAvatar(); } }); } @@ -832,24 +833,17 @@ public enum VSubmenuConstructed implements IVSubmenu { } private void changePlayerFocus(int newFocusOwner, GameType gType) { + playerPanelWithFocus.setFocused(false); playerWithFocus = newFocusOwner; playerPanelWithFocus = playerPanels.get(playerWithFocus); + playerPanelWithFocus.setFocused(true); - changeAvatarFocus(); playersScroll.getViewport().scrollRectToVisible(playerPanelWithFocus.getBounds()); populateDeckPanel(gType); refreshPanels(true, true); } - /** Changes avatar appearance dependant on focus player. */ - private void changeAvatarFocus() { - for (int i = 0; i < playerPanels.size(); i++) { - PlayerPanel pp = playerPanels.get(i); - pp.setFocused(i == playerWithFocus); - } - } - /** Saves avatar prefs for players one and two. */ private void updateAvatarPrefs() { int pOneIndex = playerPanels.get(0).getAvatarIndex();