cleanup: one-letter variables are bad.

This commit is contained in:
Eric House 2012-06-15 06:43:54 -07:00
parent 405cb23023
commit 6beb572180

View file

@ -452,7 +452,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
drawCentered( m_remText, rInner, null );
}
public void measureScoreText( Rect r, DrawScoreInfo dsi,
public void measureScoreText( Rect rect, DrawScoreInfo dsi,
int[] width, int[] height )
{
String[] scoreInfo = new String[dsi.isTurn?1:2];
@ -476,7 +476,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
scoreInfo[indx] = sb.toString();
m_scores[dsi.playerNum] = scoreInfo;
m_fillPaint.setTextSize( dsi.isTurn? r.height() : m_defaultFontHt );
m_fillPaint.setTextSize( dsi.isTurn? rect.height() : m_defaultFontHt );
int needWidth = 0;
for ( int ii = 0; ii < scoreInfo.length; ++ii ) {
@ -486,12 +486,12 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
needWidth = m_boundsScratch.width();
}
}
if ( needWidth > r.width() ) {
needWidth = r.width();
if ( needWidth > rect.width() ) {
needWidth = rect.width();
}
width[0] = needWidth;
height[0] = r.height();
height[0] = rect.height();
}
public void score_drawPlayer( Rect rInner, Rect rOuter,