Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

do a better job of figuring out whether to use black or white to

Browse source 
outline blank tiles.
This commit is contained in:
Andy2 2011-06-06 18:28:20 -07:00
parent 1f664fa9e8
commit 2ce4c1417c
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -515,7 +515,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
} }
if ( (CELL_ISBLANK & flags) != 0 ) { if ( (CELL_ISBLANK & flags) != 0 ) {
markBlank( rect, pending ); markBlank( rect, backColor );
} }
// frame the cell // frame the cell
@ -936,10 +936,22 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
return null != m_fontDims; return null != m_fontDims;
} // figureFontDims } // figureFontDims
private void markBlank( final Rect rect, boolean whiteOnBlack ) private boolean isLightColor( int color )
{
int sum = 0;
for ( int ii = 0; ii < 3; ++ii ) {
sum += color & 0xFF;
color >>= 8;
}
boolean result = sum > (127*3);
return result;
}
private void markBlank( final Rect rect, int backColor )
{ {
RectF oval = new RectF( rect.left, rect.top, rect.right, rect.bottom ); RectF oval = new RectF( rect.left, rect.top, rect.right, rect.bottom );
int curColor = 0; int curColor = 0;
boolean whiteOnBlack = !isLightColor( backColor );
if ( whiteOnBlack ) { if ( whiteOnBlack ) {
curColor = m_strokePaint.getColor(); curColor = m_strokePaint.getColor();
m_strokePaint.setColor( WHITE ); m_strokePaint.setColor( WHITE );
@ -955,13 +967,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
int background = m_otherColors[ CommonPrefs.COLOR_NOTILE ]; int background = m_otherColors[ CommonPrefs.COLOR_NOTILE ];
if ( background != m_backgroundUsed ) { if ( background != m_backgroundUsed ) {
m_backgroundUsed = background; m_backgroundUsed = background;
m_darkOnLight = isLightColor( background );
int sum = 0;
for ( int ii = 0; ii < 3; ++ii ) {
sum += background & 0xFF;
background >>= 8;
}
m_darkOnLight = sum > (127*3);
} }
return m_darkOnLight; return m_darkOnLight;
} }