Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

just draw the bitmap in the largest rect possible.

Browse source
This commit is contained in:
eehouse 2010-02-28 16:54:06 +00:00
parent 36fd71bde8
commit da46fe3163
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -372,7 +372,9 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
if ( null == bitmaps ) {
drawCentered( text, rect, m_fontDims );
} else {
drawBestBitmap( bitmaps, rect );
Rect smaller = new Rect(rect);
smaller.inset( 2, 2 );
drawBestBitmap( bitmaps, smaller );
}
}
@ -738,16 +740,14 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
private void drawBestBitmap( BitmapDrawable[] bitmaps, final Rect rect )
{
Rect local = new Rect( rect );
int fontHt = m_fontDims.heightFor( local.height() );
int fontWidth = m_fontDims.widthFor( local.width() );
local.top = local.bottom - fontHt;
local.right = local.left + m_fontDims.widthFor( rect.width() );
int height = local.height();
int width = local.width();
int ii;
for ( ii = bitmaps.length-1; ii > 0; --ii ) {
Bitmap bitmap = bitmaps[ii].getBitmap();
if ( bitmap.getWidth() <= fontWidth
&& bitmap.getHeight() <= fontHt ) {
if ( bitmap.getWidth() <= width
&& bitmap.getHeight() <= height ) {
break;
}
}