external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'deckChooserAccessibility' into 'master'

Browse Source 
Deck Chooser keyboard accessibility fix

See merge request core-developers/forge!2957
This commit is contained in:
Michael Kamensky
2020-07-05 04:04:43 +00:00
parent 9df9fcfb6d 6b7eb0422f
commit 6c76b9e948
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
View File

@@ -11,9 +11,7 @@ import com.google.common.collect.Iterables;
import forge.deck.DeckProxy; import forge.deck.DeckProxy;
import forge.deck.DeckType; import forge.deck.DeckType;
import forge.deckchooser.DecksComboBoxEvent;
import forge.deckchooser.FDeckChooser; import forge.deckchooser.FDeckChooser;
import forge.deckchooser.IDecksComboBoxListener;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
@@ -80,35 +78,15 @@ public class CLobby {
final FDeckChooser fdccom = view.getCommanderDeckChooser(iSlot); final FDeckChooser fdccom = view.getCommanderDeckChooser(iSlot);
fdccom.initialize(FPref.COMMANDER_DECK_STATES[iSlot], defaultDeckTypeForCommanderSlot(iSlot)); fdccom.initialize(FPref.COMMANDER_DECK_STATES[iSlot], defaultDeckTypeForCommanderSlot(iSlot));
fdccom.populate(); fdccom.populate();
fdccom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
@Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
view.focusOnAvatar();
}
});
final FDeckChooser fdobcom = view.getOathbreakerDeckChooser(iSlot); final FDeckChooser fdobcom = view.getOathbreakerDeckChooser(iSlot);
fdobcom.initialize(FPref.OATHBREAKER_DECK_STATES[iSlot], defaultDeckTypeForOathbreakerSlot(iSlot)); fdobcom.initialize(FPref.OATHBREAKER_DECK_STATES[iSlot], defaultDeckTypeForOathbreakerSlot(iSlot));
fdobcom.populate(); fdobcom.populate();
fdobcom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
@Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
view.focusOnAvatar();
}
});
final FDeckChooser fdtlcom = view.getTinyLeaderDeckChooser(iSlot); final FDeckChooser fdtlcom = view.getTinyLeaderDeckChooser(iSlot);
fdtlcom.initialize(FPref.TINY_LEADER_DECK_STATES[iSlot], defaultDeckTypeForTinyLeaderSlot(iSlot)); fdtlcom.initialize(FPref.TINY_LEADER_DECK_STATES[iSlot], defaultDeckTypeForTinyLeaderSlot(iSlot));
fdtlcom.populate(); fdtlcom.populate();
fdtlcom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
@Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
view.focusOnAvatar();
}
});
final FDeckChooser fdbcom = view.getBrawlDeckChooser(iSlot); final FDeckChooser fdbcom = view.getBrawlDeckChooser(iSlot);
fdbcom.initialize(FPref.BRAWL_DECK_STATES[iSlot], defaultDeckTypeForBrawlSlot(iSlot)); fdbcom.initialize(FPref.BRAWL_DECK_STATES[iSlot], defaultDeckTypeForBrawlSlot(iSlot));
fdbcom.populate(); fdbcom.populate();
fdbcom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
@Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
view.focusOnAvatar();
}
});
} }
final ForgePreferences prefs = FModel.getPreferences(); final ForgePreferences prefs = FModel.getPreferences();

7
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
View File

@@ -3,9 +3,7 @@ package forge.screens.home.sanctioned;
import javax.swing.JPanel; import javax.swing.JPanel;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import forge.deckchooser.DecksComboBoxEvent;
import forge.deckchooser.FDeckChooser; import forge.deckchooser.FDeckChooser;
import forge.deckchooser.IDecksComboBoxListener;
import forge.gui.framework.DragCell; import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab; import forge.gui.framework.DragTab;
import forge.gui.framework.EDocID; import forge.gui.framework.EDocID;
@@ -131,11 +129,6 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
for (final FDeckChooser fdc : vLobby.getDeckChoosers()) { for (final FDeckChooser fdc : vLobby.getDeckChoosers()) {
fdc.populate(); fdc.populate();
fdc.getDecksComboBox().addListener(new IDecksComboBoxListener() {
@Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
vLobby.focusOnAvatar();
}
});
} }
container.add(vLobby.getConstructedFrame(), "gap 20px 20px 20px 0px, push, grow"); container.add(vLobby.getConstructedFrame(), "gap 20px 20px 20px 0px, push, grow");