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

Save single card zoom setting between sessions

Browse Source
This commit is contained in:
drdev
2015-04-19 14:59:03 +00:00
parent 7f7251f2fa
commit 3bdc842fde
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@@ -14,6 +14,9 @@ import forge.game.GameView;
import forge.game.card.CardView; import forge.game.card.CardView;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref;
import forge.screens.match.MatchController; import forge.screens.match.MatchController;
import forge.toolbox.FCardPanel; import forge.toolbox.FCardPanel;
import forge.toolbox.FDialog; import forge.toolbox.FDialog;
@@ -25,11 +28,12 @@ public class CardZoom extends FOverlay {
private static final float REQ_AMOUNT = Utils.AVG_FINGER_WIDTH; private static final float REQ_AMOUNT = Utils.AVG_FINGER_WIDTH;
private static final CardZoom cardZoom = new CardZoom(); private static final CardZoom cardZoom = new CardZoom();
private static final ForgePreferences prefs = FModel.getPreferences();
private static List<?> items; private static List<?> items;
private static int currentIndex, initialIndex; private static int currentIndex, initialIndex;
private static CardView currentCard, prevCard, nextCard; private static CardView currentCard, prevCard, nextCard;
private static boolean zoomMode = true; private static boolean zoomMode = true;
private static boolean oneCardView = false; private static boolean oneCardView = prefs.getPrefBoolean(FPref.UI_SINGLE_CARD_ZOOM);
private float totalZoomAmount; private float totalZoomAmount;
private static ActivateHandler activateHandler; private static ActivateHandler activateHandler;
private static String currentActivateAction; private static String currentActivateAction;
@@ -156,16 +160,24 @@ public class CardZoom extends FOverlay {
return false; return false;
} }
private void setOneCardView(boolean oneCardView0) {
if (oneCardView == oneCardView0) { return; }
oneCardView = oneCardView0;
prefs.setPref(FPref.UI_SINGLE_CARD_ZOOM, oneCardView0);
prefs.save();
}
@Override @Override
public boolean zoom(float x, float y, float amount) { public boolean zoom(float x, float y, float amount) {
totalZoomAmount += amount; totalZoomAmount += amount;
if (totalZoomAmount >= REQ_AMOUNT) { if (totalZoomAmount >= REQ_AMOUNT) {
oneCardView = true; setOneCardView(true);
totalZoomAmount = 0; totalZoomAmount = 0;
} }
else if (totalZoomAmount <= -REQ_AMOUNT) { else if (totalZoomAmount <= -REQ_AMOUNT) {
oneCardView = false; setOneCardView(false);
totalZoomAmount = 0; totalZoomAmount = 0;
} }
return true; return true;
@@ -173,7 +185,7 @@ public class CardZoom extends FOverlay {
@Override @Override
public boolean longPress(float x, float y) { public boolean longPress(float x, float y) {
oneCardView = !oneCardView; setOneCardView(!oneCardView);
return true; return true;
} }

1
forge-gui/src/main/java/forge/properties/ForgePreferences.java
View File

@@ -56,6 +56,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
UI_COMPACT_TABS ("false"), UI_COMPACT_TABS ("false"),
UI_COMPACT_LIST_ITEMS ("false"), UI_COMPACT_LIST_ITEMS ("false"),
UI_CARD_SIZE ("small"), UI_CARD_SIZE ("small"),
UI_SINGLE_CARD_ZOOM("false"),
UI_BUGZ_NAME (""), UI_BUGZ_NAME (""),
UI_BUGZ_PWD (""), UI_BUGZ_PWD (""),
UI_ANTE ("false"), UI_ANTE ("false"),