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 'master' into 'master'

Browse Source 
[Mobile] Add Scroll Indicator Option on Matchscreen

See merge request core-developers/forge!4055
This commit is contained in:
Anthony Calosa
2021-03-01 05:53:55 +00:00
parent 26a67bd44f 0ed07d91cb
commit 276370fdec
10 changed files with 104 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/Graphics.java
View File

@@ -552,9 +552,12 @@ public class Graphics {
} }
public void fillTriangle(FSkinColor skinColor, float x1, float y1, float x2, float y2, float x3, float y3) { public void fillTriangle(FSkinColor skinColor, float x1, float y1, float x2, float y2, float x3, float y3) {
fillTriangle(skinColor.getColor(), x1, y1, x2, y2, x3, y3); drawTriangle(skinColor.getColor(), x1, y1, x2, y2, x3, y3, true);
} }
public void fillTriangle(Color color, float x1, float y1, float x2, float y2, float x3, float y3) { public void drawTriangle(FSkinColor skinColor, float x1, float y1, float x2, float y2, float x3, float y3) {
drawTriangle(skinColor.getColor(), x1, y1, x2, y2, x3, y3, false);
}
public void drawTriangle(Color color, float x1, float y1, float x2, float y2, float x3, float y3, boolean fill) {
batch.end(); //must pause batch while rendering shapes batch.end(); //must pause batch while rendering shapes
if (alphaComposite < 1) { if (alphaComposite < 1) {
@@ -564,7 +567,7 @@ public class Graphics {
Gdx.gl.glEnable(GL_BLEND); Gdx.gl.glEnable(GL_BLEND);
} }
startShape(ShapeType.Filled); startShape(fill ? ShapeType.Filled : ShapeType.Line);
shapeRenderer.setColor(color); shapeRenderer.setColor(color);
shapeRenderer.triangle(adjustX(x1), adjustY(y1, 0), adjustX(x2), adjustY(y2, 0), adjustX(x3), adjustY(y3, 0)); shapeRenderer.triangle(adjustX(x1), adjustY(y1, 0), adjustX(x2), adjustY(y2, 0), adjustX(x3), adjustY(y3, 0));
endShape(); endShape();

141
forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
View File

@@ -244,70 +244,71 @@ public class SettingsPage extends TabPage<SettingsScreen> {
localizer.getMessage("nlLoadHistoricFormats")), localizer.getMessage("nlLoadHistoricFormats")),
3); 3);
lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_UNKNOWN_CARDS, lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_UNKNOWN_CARDS,
localizer.getMessage("lblEnableUnknownCards"), localizer.getMessage("lblEnableUnknownCards"),
localizer.getMessage("nlEnableUnknownCards")) { localizer.getMessage("nlEnableUnknownCards")) {
@Override
public void select() {
super.select();
FOptionPane.showConfirmDialog(
localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
@Override @Override
public void select() { public void run(Boolean result) {
super.select(); if (result) {
FOptionPane.showConfirmDialog( Forge.restart(true);
localizer.getMessage("lblRestartForgeDescription"), }
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
Forge.restart(true);
}
}
});
} }
}, }
3); );
}
},
3);
lstSettings.addItem(new BooleanSetting(FPref.UI_NETPLAY_COMPAT, lstSettings.addItem(new BooleanSetting(FPref.UI_NETPLAY_COMPAT,
localizer.getMessage("lblExperimentalNetworkCompatibility"), localizer.getMessage("lblExperimentalNetworkCompatibility"),
localizer.getMessage("nlExperimentalNetworkCompatibility")) { localizer.getMessage("nlExperimentalNetworkCompatibility")) {
@Override @Override
public void select() { public void select() {
super.select(); super.select();
GuiBase.enablePropertyConfig(FModel.getPreferences().getPrefBoolean(FPref.UI_NETPLAY_COMPAT)); GuiBase.enablePropertyConfig(FModel.getPreferences().getPrefBoolean(FPref.UI_NETPLAY_COMPAT));
} }
}, },
3); 3);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_DISPOSE_TEXTURES, lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_DISPOSE_TEXTURES,
localizer.getMessage("lblDisposeTextures"), localizer.getMessage("lblDisposeTextures"),
localizer.getMessage("nlDisposeTextures")) { localizer.getMessage("nlDisposeTextures")) {
@Override @Override
public void select() { public void select() {
super.select(); super.select();
Forge.disposeTextures = FModel.getPreferences().getPrefBoolean(FPref.UI_ENABLE_DISPOSE_TEXTURES); Forge.disposeTextures = FModel.getPreferences().getPrefBoolean(FPref.UI_ENABLE_DISPOSE_TEXTURES);
} }
}, },
3); 3);
if (GuiBase.isAndroid()) { //this option does nothing except on Android if (GuiBase.isAndroid()) { //this option does nothing except on Android
lstSettings.addItem(new BooleanSetting(FPref.UI_AUTO_CACHE_SIZE, lstSettings.addItem(new BooleanSetting(FPref.UI_AUTO_CACHE_SIZE,
localizer.getMessage("lblAutoCacheSize"), localizer.getMessage("lblAutoCacheSize"),
localizer.getMessage("nlAutoCacheSize")) { localizer.getMessage("nlAutoCacheSize")) {
@Override @Override
public void select() { public void select() {
super.select(); super.select();
FOptionPane.showConfirmDialog( FOptionPane.showConfirmDialog (
localizer.getMessage("lblRestartForgeDescription"), localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"), localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"), localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() { localizer.getMessage("lblLater"), new Callback<Boolean>() {
@Override @Override
public void run(Boolean result) { public void run(Boolean result) {
if (result) { if (result) {
Forge.restart(true); Forge.restart(true);
} }
} }
}); }
} );
}, }
3); },
3);
} }
//Graphic Options //Graphic Options
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER, lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER,
localizer.getMessage("cbImageFetcher"), localizer.getMessage("cbImageFetcher"),
@@ -361,20 +362,20 @@ public class SettingsPage extends TabPage<SettingsScreen> {
ForgeConstants.DISP_CURRENT_COLORS_ALWAYS}), ForgeConstants.DISP_CURRENT_COLORS_ALWAYS}),
4); 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_SPLIT_CARDS, lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_SPLIT_CARDS,
localizer.getMessage("lblRotateZoomSplit"), localizer.getMessage("lblRotateZoomSplit"),
localizer.getMessage("nlRotateZoomSplit")), localizer.getMessage("nlRotateZoomSplit")),
4); 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_PLANE_OR_PHENOMENON, lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_PLANE_OR_PHENOMENON,
localizer.getMessage("lblRotateZoomPlanesPhenomena"), localizer.getMessage("lblRotateZoomPlanesPhenomena"),
localizer.getMessage("nlRotateZoomPlanesPhenomena")), localizer.getMessage("nlRotateZoomPlanesPhenomena")),
4); 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_DYNAMIC_PLANECHASE_BG, lstSettings.addItem(new BooleanSetting(FPref.UI_DYNAMIC_PLANECHASE_BG,
localizer.getMessage("lblDynamicBackgroundPlanechase"), localizer.getMessage("lblDynamicBackgroundPlanechase"),
localizer.getMessage("nlDynamicBackgroundPlanechase")), localizer.getMessage("nlDynamicBackgroundPlanechase")),
4); 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_DISABLE_IMAGES_EFFECT_CARDS, lstSettings.addItem(new BooleanSetting(FPref.UI_DISABLE_IMAGES_EFFECT_CARDS,
localizer.getMessage("lblDisableCardEffect"), localizer.getMessage("lblDisableCardEffect"),
localizer.getMessage("nlDisableCardEffect")), localizer.getMessage("nlDisableCardEffect")),
4); 4);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_ENABLE_BORDER_MASKING, lstSettings.addItem(new CustomSelectSetting(FPref.UI_ENABLE_BORDER_MASKING,
localizer.getMessage("lblBorderMaskOption"), localizer.getMessage("lblBorderMaskOption"),
@@ -387,8 +388,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
} }
}, 4); }, 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART, lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART,
localizer.getMessage("lblPreloadExtendedArtCards"), localizer.getMessage("lblPreloadExtendedArtCards"),
localizer.getMessage("nlPreloadExtendedArtCards")){ localizer.getMessage("nlPreloadExtendedArtCards")){
@Override @Override
public void select() { public void select() {
super.select(); super.select();
@@ -396,9 +397,13 @@ public class SettingsPage extends TabPage<SettingsScreen> {
Forge.enablePreloadExtendedArt = FModel.getPreferences().getPrefBoolean(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART); Forge.enablePreloadExtendedArt = FModel.getPreferences().getPrefBoolean(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
} }
},4); },4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR,
localizer.getMessage("lblMatchScrollIndicator"),
localizer.getMessage("nlMatchScrollIndicator")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_FPS, lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_FPS,
localizer.getMessage("lblShowFPSDisplay"), localizer.getMessage("lblShowFPSDisplay"),
localizer.getMessage("nlShowFPSDisplay")){ localizer.getMessage("nlShowFPSDisplay")){
@Override @Override
public void select() { public void select() {
super.select(); super.select();

16
forge-gui-mobile/src/forge/toolbox/FScrollPane.java
View File

@@ -6,14 +6,17 @@ import com.badlogic.gdx.math.Vector2;
import forge.Graphics; import forge.Graphics;
import forge.animation.ForgeAnimation; import forge.animation.ForgeAnimation;
import forge.assets.FSkinColor;
import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.util.PhysicsObject; import forge.util.PhysicsObject;
import forge.util.Utils; import forge.util.Utils;
public abstract class FScrollPane extends FContainer { public abstract class FScrollPane extends FContainer {
private static final float FLING_DECEL = 750f; private static final float FLING_DECEL = 750f;
/*private static final FSkinColor INDICATOR_COLOR = FSkinColor.get(Colors.CLR_TEXT).alphaColor(0.7f); private static final FSkinColor INDICATOR_COLOR = FSkinColor.get(FSkinColor.Colors.CLR_TEXT).alphaColor(0.7f);
private static final float INDICATOR_SIZE = Utils.scale(5); private static final float INDICATOR_SIZE = Utils.scale(5);
private static final float INDICATOR_MARGIN = Utils.scale(3);*/ private static final float INDICATOR_MARGIN = Utils.scale(3);
private float scrollLeft, scrollTop; private float scrollLeft, scrollTop;
private ScrollBounds scrollBounds; private ScrollBounds scrollBounds;
@@ -152,9 +155,14 @@ public abstract class FScrollPane extends FContainer {
@Override @Override
protected void drawOverlay(Graphics g) { protected void drawOverlay(Graphics g) {
boolean isFieldZoneView = toString().contains("VField")||toString().contains("VZoneDisplay");
//TODO: Consider other ways to indicate scroll potential that fade in and out based on input //TODO: Consider other ways to indicate scroll potential that fade in and out based on input
//draw triangles indicating scroll potential //draw triangles indicating scroll potential
/*if (scrollLeft > 0) { if (!FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR))
return;
if (!isFieldZoneView)
return;
if (scrollLeft > 0) {
float x = INDICATOR_MARGIN; float x = INDICATOR_MARGIN;
float y = getHeight() / 2; float y = getHeight() / 2;
g.fillTriangle(INDICATOR_COLOR, x, y, x + INDICATOR_SIZE, y - INDICATOR_SIZE, x + INDICATOR_SIZE, y + INDICATOR_SIZE); g.fillTriangle(INDICATOR_COLOR, x, y, x + INDICATOR_SIZE, y - INDICATOR_SIZE, x + INDICATOR_SIZE, y + INDICATOR_SIZE);
@@ -173,7 +181,7 @@ public abstract class FScrollPane extends FContainer {
float x = getWidth() / 2; float x = getWidth() / 2;
float y = getHeight() - INDICATOR_MARGIN; float y = getHeight() - INDICATOR_MARGIN;
g.fillTriangle(INDICATOR_COLOR, x, y, x - INDICATOR_SIZE, y - INDICATOR_SIZE, x + INDICATOR_SIZE, y - INDICATOR_SIZE); g.fillTriangle(INDICATOR_COLOR, x, y, x - INDICATOR_SIZE, y - INDICATOR_SIZE, x + INDICATOR_SIZE, y - INDICATOR_SIZE);
}*/ }
} }
//allow overriding to adjust what scroll positions are restored after layout //allow overriding to adjust what scroll positions are restored after layout

2
forge-gui/res/languages/de-DE.properties
View File

@@ -1001,6 +1001,8 @@ lblEnableRoundBorder=Aktiviere Maske mit runden Ränder
nlEnableRoundBorder=Wenn aktiviert, werden Kartenecken abgerundet. Vorzugsweise bei Karten mit vollem Rand. nlEnableRoundBorder=Wenn aktiviert, werden Kartenecken abgerundet. Vorzugsweise bei Karten mit vollem Rand.
lblPreloadExtendedArtCards=Erw. Kartenbilder bei Start laden lblPreloadExtendedArtCards=Erw. Kartenbilder bei Start laden
nlPreloadExtendedArtCards=Wenn aktiviert, werden erweiterte Kartenbilder bereits beim Start in den Speicher geladen (Hohe RAM-Auslastung). nlPreloadExtendedArtCards=Wenn aktiviert, werden erweiterte Kartenbilder bereits beim Start in den Speicher geladen (Hohe RAM-Auslastung).
lblEnableMatchScrollIndicator=Match Scroll Indicator
nlEnableMatchScrollIndicator=When enabled, show the scroll indicator on the match screen.
lblShowFPSDisplay=FPS-Anzeige lblShowFPSDisplay=FPS-Anzeige
nlShowFPSDisplay=Aktiviert die Frames-per-second-Anzeige (Experimentell). nlShowFPSDisplay=Aktiviert die Frames-per-second-Anzeige (Experimentell).
lblEnableUnknownCards=Erlaube unbekannte Karten lblEnableUnknownCards=Erlaube unbekannte Karten

2
forge-gui/res/languages/en-US.properties
View File

@@ -1001,6 +1001,8 @@ lblEnableRoundBorder=Enable Round Border Mask
nlEnableRoundBorder=When enabled, the card corners are rounded (Preferably Card with Full Borders). nlEnableRoundBorder=When enabled, the card corners are rounded (Preferably Card with Full Borders).
lblPreloadExtendedArtCards=Preload Extended Art Cards lblPreloadExtendedArtCards=Preload Extended Art Cards
nlPreloadExtendedArtCards=When enabled, Preloads Extended Art Cards to Cache on Startup (High RAM usage). nlPreloadExtendedArtCards=When enabled, Preloads Extended Art Cards to Cache on Startup (High RAM usage).
lblMatchScrollIndicator=Match Scroll Indicator
nlMatchScrollIndicator=When enabled, show the scroll indicator on the match screen.
lblShowFPSDisplay=Show FPS Display lblShowFPSDisplay=Show FPS Display
nlShowFPSDisplay=When enabled, show the FPS Display (Experimental). nlShowFPSDisplay=When enabled, show the FPS Display (Experimental).
lblEnableUnknownCards=Enable Unknown Cards lblEnableUnknownCards=Enable Unknown Cards

2
forge-gui/res/languages/es-ES.properties
View File

@@ -1001,6 +1001,8 @@ lblEnableRoundBorder=Habilitar máscara de bordes redondeados
nlEnableRoundBorder=Cuando está habilitado, las esquinas de las cartas se redondean (Preferiblemente Cartas con bordes completos). nlEnableRoundBorder=Cuando está habilitado, las esquinas de las cartas se redondean (Preferiblemente Cartas con bordes completos).
lblPreloadExtendedArtCards=Precargar cartas de arte extendido lblPreloadExtendedArtCards=Precargar cartas de arte extendido
nlPreloadExtendedArtCards=Cuando está habilitado, carga previamente las cartas de arte ampliadas en la caché al iniciar el programa (Alto uso de RAM). nlPreloadExtendedArtCards=Cuando está habilitado, carga previamente las cartas de arte ampliadas en la caché al iniciar el programa (Alto uso de RAM).
lblEnableMatchScrollIndicator=Match Scroll Indicator
nlEnableMatchScrollIndicator=When enabled, show the scroll indicator on the match screen.
lblShowFPSDisplay=Mostrar FPS lblShowFPSDisplay=Mostrar FPS
nlShowFPSDisplay=Cuando está habilitado, muestra los FPS (Experimental). nlShowFPSDisplay=Cuando está habilitado, muestra los FPS (Experimental).
lblEnableUnknownCards=Habilitar cartas desconocidas lblEnableUnknownCards=Habilitar cartas desconocidas

2
forge-gui/res/languages/it-IT.properties
View File

@@ -1001,6 +1001,8 @@ lblEnableRoundBorder=Abilita maschera bordo arrotondato
nlEnableRoundBorder=Se abilitato, gli angoli delle carte sono arrotondati (preferibilmente Carta con bordi pieni). nlEnableRoundBorder=Se abilitato, gli angoli delle carte sono arrotondati (preferibilmente Carta con bordi pieni).
lblPreloadExtendedArtCards=Carte d''arte estese precaricate lblPreloadExtendedArtCards=Carte d''arte estese precaricate
nlPreloadExtendedArtCards=Se abilitato, precarica le carte artistiche estese nella cache all''avvio (Utilizzo elevato della RAM). nlPreloadExtendedArtCards=Se abilitato, precarica le carte artistiche estese nella cache all''avvio (Utilizzo elevato della RAM).
lblEnableMatchScrollIndicator=Match Scroll Indicator
nlEnableMatchScrollIndicator=When enabled, show the scroll indicator on the match screen.
lblShowFPSDisplay=Mostra display FPS lblShowFPSDisplay=Mostra display FPS
nlShowFPSDisplay=Se abilitato, mostra il display FPS (sperimentale). nlShowFPSDisplay=Se abilitato, mostra il display FPS (sperimentale).
lblEnableUnknownCards=Enable Unknown Cards lblEnableUnknownCards=Enable Unknown Cards

2
forge-gui/res/languages/ja-JP.properties
View File

@@ -1001,6 +1001,8 @@ lblEnableRoundBorder=ラウンドボーダーマスクを有効にする
nlEnableRoundBorder=有効にすると、カードの角は丸みを帯びます（枠を含めるカード画像を使う時） nlEnableRoundBorder=有効にすると、カードの角は丸みを帯びます（枠を含めるカード画像を使う時）
lblPreloadExtendedArtCards=拡張アートのカード画像のプリロード lblPreloadExtendedArtCards=拡張アートのカード画像のプリロード
nlPreloadExtendedArtCards=有効にすると、起動時に拡張アートのカード画像をキャッシュにプリロードする。 nlPreloadExtendedArtCards=有効にすると、起動時に拡張アートのカード画像をキャッシュにプリロードする。
lblEnableMatchScrollIndicator=Match Scroll Indicator
nlEnableMatchScrollIndicator=When enabled, show the scroll indicator on the match screen.
lblShowFPSDisplay=FPS ディスプレイを表示 lblShowFPSDisplay=FPS ディスプレイを表示
nlShowFPSDisplay=有効にすると、FPS ディスプレイ（実験的）を表示します。 nlShowFPSDisplay=有効にすると、FPS ディスプレイ（実験的）を表示します。
lblEnableUnknownCards=未知のカードを有効にする lblEnableUnknownCards=未知のカードを有効にする

2
forge-gui/res/languages/zh-CN.properties
View File

@@ -1000,6 +1000,8 @@ lblEnableRoundBorder=启用圆角边框掩码
nlEnableRoundBorder=启用后，卡牌边框会变成圆角(带有完整边框的卡牌图片效果最好)。 nlEnableRoundBorder=启用后，卡牌边框会变成圆角(带有完整边框的卡牌图片效果最好)。
lblPreloadExtendedArtCards=预加载拉伸卡图 lblPreloadExtendedArtCards=预加载拉伸卡图
nlPreloadExtendedArtCards=启用后，拉伸卡图将在启动时加载到缓存（使用高内存）。 nlPreloadExtendedArtCards=启用后，拉伸卡图将在启动时加载到缓存（使用高内存）。
lblEnableMatchScrollIndicator=Match Scroll Indicator
nlEnableMatchScrollIndicator=When enabled, show the scroll indicator on the match screen.
lblShowFPSDisplay=显示当前的FPS值 lblShowFPSDisplay=显示当前的FPS值
nlShowFPSDisplay=启用后，将在画面左上角显示当前Forge的FPS（实验性特性）。 nlShowFPSDisplay=启用后，将在画面左上角显示当前Forge的FPS（实验性特性）。
lblEnableUnknownCards=启用未知卡牌 lblEnableUnknownCards=启用未知卡牌

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

@@ -143,6 +143,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
UI_DISABLE_IMAGES_EFFECT_CARDS("false"), UI_DISABLE_IMAGES_EFFECT_CARDS("false"),
UI_ENABLE_PRELOAD_EXTENDED_ART("false"), UI_ENABLE_PRELOAD_EXTENDED_ART("false"),
UI_ENABLE_BORDER_MASKING("Crop"), UI_ENABLE_BORDER_MASKING("Crop"),
UI_ENABLE_MATCH_SCROLL_INDICATOR("false"),
UI_SHOW_FPS("false"), UI_SHOW_FPS("false"),
UI_NETPLAY_COMPAT("false"), UI_NETPLAY_COMPAT("false"),
UI_ENABLE_DISPOSE_TEXTURES("false"), UI_ENABLE_DISPOSE_TEXTURES("false"),