Commit graph

7332 commits

Author SHA1 Message Date
Eric House
272fc6e812 Move board_layout call onto jni thread, and change order in which it's
done to make that work. This is a snapshot: not all boards draw completely,
and there's other debugging to be done.
2013-11-06 06:49:27 -08:00
Eric House
7c47c27cee dispose any existing draw ctxt before setting another. 2013-11-05 07:36:56 -08:00
Eric House
499e07d84b follow convention: width usually comes before height 2013-11-05 06:38:48 -08:00
Eric House
de284588f7 test for X86 developers too 2013-11-05 06:36:16 -08:00
Eric House
f0bfbedfb9 call script from build.xml to generate Application.mk 2013-11-04 19:23:47 -08:00
Eric House
f1f02df355 remove file to be generated by build system 2013-11-04 19:19:09 -08:00
Eric House
e6c08a83ab tweak text: including both processors after all 2013-11-04 07:40:49 -08:00
Eric House
633d41a6ef Revert "x86-only for this one release"
This reverts commit 67c6c635e4.
2013-11-04 07:35:12 -08:00
Eric House
03b023d506 dispose any existing draw ctxt before setting another. 2013-11-04 07:33:12 -08:00
Eric House
d4cf98553c Merge branch 'android_branch' into android_thumbnail 2013-11-04 06:37:13 -08:00
Eric House
2d7392a16d pass new score- and tray-size params through 2013-11-04 06:36:52 -08:00
Eric House
9c9a04025a Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
2013-11-04 06:20:53 -08:00
Eric House
9f1b0c5121 Specify relative height of scoreboard and tray in board_figureLayout,
and allow those to be 0.
2013-11-04 06:19:33 -08:00
Eric House
f0b554213b assert rect isn't too small to inset 2013-11-04 05:59:18 -08:00
Eric House
ccb07a67da update strings for this x86-only release 2013-11-03 13:04:22 -08:00
Eric House
67c6c635e4 x86-only for this one release 2013-11-03 12:52:53 -08:00
Eric House
d11375b5f5 apply contributed patch adding x86 version of libxwjni.so 2013-11-03 12:21:52 -08:00
Eric House
59dc69c0d9 apply contributed patch making Makefile variable naming match required
conventions for CLEAR_VARS.
2013-11-03 12:21:28 -08:00
Eric House
e01af60dab build with COMMON_LAYOUT defined, and when off-by-default debug pref
is on use it instead of java-side layout.
2013-11-03 12:17:20 -08:00
Eric House
184ac28ebc fix to compile, and in gtk case to work, when COMMON_LAYOUT defined 2013-11-03 12:15:53 -08:00
Eric House
5a65bca12a add board functions to figure layout (position and size of board,
tray, etc.), removing need for each client to do it itself.
2013-11-03 12:12:25 -08:00
Eric House
367006a18d Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 2013-11-03 05:22:53 -08:00
Eric House
b151cb977e apply patches from Brendan Le Foll <brendan.le.foll@intel.com> to
enable x86 ndk support
2013-11-03 05:22:20 -08:00
Eric House
251ad5de25 apply contributed patch adding x86 version of libxwjni.so 2013-11-01 21:22:42 -07:00
Eric House
4ae79f6f27 apply contributed patch making Makefile variable naming match required
conventions for CLEAR_VARS.
2013-11-01 21:16:52 -07:00
Eric House
cc994368aa move ints and booleans between java and c structs using arrays of data
rather than a ton of nearly identical function calls.
2013-11-01 19:10:08 -07:00
Eric House
b9d0469cfe fix OFFSET_OF ptr size to quiet compiler 2013-11-01 19:09:05 -07:00
Eric House
5dd209ef27 init summaries earlier 2013-10-31 20:33:23 -07:00
Eric House
9cd7dd6c98 fix to compile post-merge 2013-10-31 08:14:14 -07:00
Eric House
d7a1f53157 Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
2013-10-31 08:13:39 -07:00
Eric House
45ad3499c5 (rough) move BoardView's Canvas into a new class so that, ideally, it
can be used separately e.g. to draw thumbnails without opening a game
into a board.  Works well enough to render a full board, but not
otherwise tested.
2013-10-31 08:08:41 -07:00
Eric House
bfa6132ade add board_setDraw() to jni 2013-10-31 08:07:07 -07:00
Eric House
182ea7f862 make it possible to set DrawCtxt after opening/creating game 2013-10-31 08:06:44 -07:00
Eric House
3858893ab2 don't crash on null dctxt 2013-10-31 06:35:23 -07:00
Eric House
88af10552e don't try to draw with null dctx 2013-10-31 06:35:00 -07:00
Eric House
8ddc9a7770 Merge branch 'android_branch' into android_thumbnail
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2013-10-30 21:46:45 -07:00
Eric House
3bfcc0cedd implement menu items, including being able to move or delete multiple
dicts at once.
2013-10-30 21:45:16 -07:00
Eric House
886f9100e1 implement delete and make default menuitems 2013-10-30 19:02:28 -07:00
Eric House
a0b1cddf7a comment out strings that are changing in English 2013-10-30 18:57:32 -07:00
Eric House
eefcd18fa8 part one of modernizing wordlists browser: long-tap selects and
de-selects, but menus aren't updated and don't work.
2013-10-30 07:03:15 -07:00
Eric House
dbf76287a8 move interfaces out of GameListAdapter and into own file; should be no
change beyond renaming.
2013-10-30 06:29:31 -07:00
Eric House
571b1d9d49 turn thumbnails on by default 2013-10-29 21:00:50 -07:00
Eric House
0960e5510c add board_getActiveRect to jni, and use it to capture a thumbnail
that's smaller.  Scaling is still a problem, though: some but not all
grid lines show up.
2013-10-29 07:51:35 -07:00
Eric House
26f5a0b269 add two out params giving number of cols and rows 2013-10-29 07:50:12 -07:00
Eric House
d72526ff84 enable turning thumbnail featuren on/off via a line in build.xml 2013-10-29 06:49:06 -07:00
Eric House
8bdde9765d Merge branch 'android_branch' into android_thumbnail 2013-10-29 06:30:03 -07:00
Eric House
1d7a443c8d cleanup 2013-10-28 21:25:44 -07:00
Eric House
969d0d0a71 cleanup 2013-10-28 07:50:43 -07:00
Eric House
cfcca8ec25 remove unused strings 2013-10-28 07:16:56 -07:00
Eric House
8ab202dd27 cleanup menu config code 2013-10-28 06:21:24 -07:00