xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-12-21 13:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: When making a move, scroll the move list window to make current move visible.

Browse Source
This commit is contained in:
Peter Osterlund
2011-12-15 00:23:32 +00:00
parent 577dd388e8
commit d945c87190
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DroidFish/src/org/petero/droidfish/DroidFish.java
View File

@@ -71,6 +71,7 @@ import android.os.PowerManager.WakeLock;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.ClipboardManager; import android.text.ClipboardManager;
import android.text.Html; import android.text.Html;
import android.text.Layout;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.style.BackgroundColorSpan; import android.text.style.BackgroundColorSpan;
@@ -98,7 +99,6 @@ import android.widget.Toast;
public class DroidFish extends Activity implements GUIInterface { public class DroidFish extends Activity implements GUIInterface {
// FIXME!!! book.txt (and test classes) should not be included in apk // FIXME!!! book.txt (and test classes) should not be included in apk
// FIXME!!! Current position in game should be visible: moveListScroll.scrollTo(0, y);
// FIXME!!! PGN view option: game continuation (for training) // FIXME!!! PGN view option: game continuation (for training)
// FIXME!!! Command to go to next/previous move in PGN export order. // FIXME!!! Command to go to next/previous move in PGN export order.
@@ -807,8 +807,13 @@ public class DroidFish extends Activity implements GUIInterface {
@Override @Override
public void moveListUpdated() { public void moveListUpdated() {
moveList.setText(gameTextListener.getSpannableData()); moveList.setText(gameTextListener.getSpannableData());
if (gameTextListener.atEnd()) Layout layout = moveList.getLayout();
moveListScroll.fullScroll(ScrollView.FOCUS_DOWN); if (layout != null) {
int currPos = gameTextListener.getCurrPos();
int line = layout.getLineForOffset(currPos);
int y = (int) ((line - 1.5) * moveList.getLineHeight());
moveListScroll.scrollTo(0, y);
}
} }
@Override @Override
@@ -1786,8 +1791,8 @@ public class DroidFish extends Activity implements GUIInterface {
public final SpannableStringBuilder getSpannableData() { public final SpannableStringBuilder getSpannableData() {
return sb; return sb;
} }
public final boolean atEnd() { public final int getCurrPos() {
return currPos >= endPos - 10; return currPos;
} }
public boolean isUpToDate() { public boolean isUpToDate() {
@@ -1936,11 +1941,15 @@ public class DroidFish extends Activity implements GUIInterface {
public void setCurrent(Node node) { public void setCurrent(Node node) {
sb.removeSpan(bgSpan); sb.removeSpan(bgSpan);
NodeInfo ni = nodeToCharPos.get(node); NodeInfo ni = nodeToCharPos.get(node);
if ((ni == null) && (node != null) && (node.getParent() != null))
ni = nodeToCharPos.get(node.getParent());
if (ni != null) { if (ni != null) {
int color = ColorTheme.instance().getColor(ColorTheme.CURRENT_MOVE); int color = ColorTheme.instance().getColor(ColorTheme.CURRENT_MOVE);
bgSpan = new BackgroundColorSpan(color); bgSpan = new BackgroundColorSpan(color);
sb.setSpan(bgSpan, ni.l0, ni.l1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); sb.setSpan(bgSpan, ni.l0, ni.l1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
currPos = ni.l0; currPos = ni.l0;
} else {
currPos = 0;
} }
currNode = node; currNode = node;
} }

4
DroidFish/src/org/petero/droidfish/gamelogic/GameTree.java
View File

@@ -956,6 +956,10 @@ public class GameTree {
this.postComment = postComment; this.postComment = postComment;
} }
public Node getParent() {
return parent;
}
/** nodePos must represent the same position as this Node object. */ /** nodePos must represent the same position as this Node object. */
private final boolean verifyChildren(Position nodePos) { private final boolean verifyChildren(Position nodePos) {
boolean anyToRemove = false; boolean anyToRemove = false;