Merge branch 'tapStatus' into 'master'

Accessible Tap status

Closes #1464

See merge request core-developers/forge!2942
This commit is contained in:
Sol
2020-07-01 00:52:08 +00:00

View File

@@ -890,7 +890,14 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
// Card name overlay // Card name overlay
titleText.setText(CardTranslation.getTranslatedName(card.getCurrentState().getName())); titleText.setText(CardTranslation.getTranslatedName(card.getCurrentState().getName()));
// Screen readers can't tell if a card is tapped.
if (isPreferenceEnabled(FPref.UI_SR_OPTIMIZE)) {
if (this.isTapped()) {
titleText.getAccessibleContext().setAccessibleDescription("tapped");
} else {
titleText.getAccessibleContext().setAccessibleDescription("");
}
}
final int damage = card.getDamage(); final int damage = card.getDamage();
damageText.setText(damage > 0 ? "\u00BB " + damage + " \u00AB" : ""); damageText.setText(damage > 0 ? "\u00BB " + damage + " \u00AB" : "");