follow convention: width usually comes before height

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

View file

@ -635,7 +635,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_board_1draw
JNIEXPORT void JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_board_1figureLayout
( 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 )
{
LOG_FUNC();
@ -650,7 +650,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_board_1figureLayout
BoardDims dims;
board_figureLayout( state->game.board, gi, scorePct, trayPct,
fontHt, fontWidth, squareTiles, &bounds,
fontWidth, fontHt, squareTiles, &bounds,
((!!jdims) ? &dims : NULL) );
destroyGI( MPPARM(mpool) &gi );

View file

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

View file

@ -393,7 +393,7 @@ board_reset( BoardCtxt* board )
void
board_figureLayout( BoardCtxt* board, const CurGameInfo* gi,
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 )
{
BoardDims ldims;

View file

@ -87,7 +87,7 @@ typedef struct _BoardDims {
void board_figureLayout( BoardCtxt* board, const CurGameInfo* gi,
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,
/* out */ BoardDims* dims );
void board_applyLayout( BoardCtxt* board, const BoardDims* dims );