Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

follow convention: width usually comes before height

Browse source
This commit is contained in:
Eric House 2013-11-05 06:38:48 -08:00
parent de284588f7
commit 499e07d84b
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/jni/xwjni.c
View file

@ -635,7 +635,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_board_1draw
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_board_1figureLayout Java_org_eehouse_android_xw4_jni_XwJNI_board_1figureLayout
( JNIEnv* env, jclass C, jint gamePtr, jobject jgi, ( JNIEnv* env, jclass C, jint gamePtr, jobject jgi,
jint scorePct, jint trayPct, jint fontHt, jint fontWidth, jint scorePct, jint trayPct, jint fontWidth, jint fontHt,
jboolean squareTiles, jobject jbounds, jobject jdims ) jboolean squareTiles, jobject jbounds, jobject jdims )
{ {
LOG_FUNC(); LOG_FUNC();
@ -650,7 +650,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_board_1figureLayout
BoardDims dims; BoardDims dims;
board_figureLayout( state->game.board, gi, scorePct, trayPct, board_figureLayout( state->game.board, gi, scorePct, trayPct,
fontHt, fontWidth, squareTiles, &bounds, fontWidth, fontHt, squareTiles, &bounds,
((!!jdims) ? &dims : NULL) ); ((!!jdims) ? &dims : NULL) );
destroyGI( MPPARM(mpool) &gi ); destroyGI( MPPARM(mpool) &gi );

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
View file

@ -152,7 +152,7 @@ public class XwJNI {
// Only if COMMON_LAYOUT defined // Only if COMMON_LAYOUT defined
public static native void board_figureLayout( int gamePtr, CurGameInfo gi, public static native void board_figureLayout( int gamePtr, CurGameInfo gi,
int scorePct, int trayPct, int scorePct, int trayPct,
int fontHt, int fontWidth, int fontWidth, int fontHt,
boolean squareTiles, boolean squareTiles,
Rect bounds, BoardDims dims ); Rect bounds, BoardDims dims );
// Only if COMMON_LAYOUT defined // Only if COMMON_LAYOUT defined

2
xwords4/common/board.c
View file

@ -393,7 +393,7 @@ board_reset( BoardCtxt* board )
void void
board_figureLayout( BoardCtxt* board, const CurGameInfo* gi, board_figureLayout( BoardCtxt* board, const CurGameInfo* gi,
XP_U16 scorePct, XP_U16 trayPct, XP_U16 scorePct, XP_U16 trayPct,
XP_U16 fontHt, XP_U16 fontWidth, XP_Bool squareTiles, XP_U16 fontWidth, XP_U16 fontHt, XP_Bool squareTiles,
const XP_Rect* bounds, BoardDims* dimsp ) const XP_Rect* bounds, BoardDims* dimsp )
{ {
BoardDims ldims; BoardDims ldims;

2
xwords4/common/board.h
View file

@ -87,7 +87,7 @@ typedef struct _BoardDims {
void board_figureLayout( BoardCtxt* board, const CurGameInfo* gi, void board_figureLayout( BoardCtxt* board, const CurGameInfo* gi,
XP_U16 scorePct, XP_U16 trayPct, XP_U16 scorePct, XP_U16 trayPct,
XP_U16 fontHt, XP_U16 fontWidth, XP_U16 fontWidth, XP_U16 fontHt,
XP_Bool squareTiles, const XP_Rect* bounds, XP_Bool squareTiles, const XP_Rect* bounds,
/* out */ BoardDims* dims ); /* out */ BoardDims* dims );
void board_applyLayout( BoardCtxt* board, const BoardDims* dims ); void board_applyLayout( BoardCtxt* board, const BoardDims* dims );