Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-04 20:46:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

more tweaks to tray tile drawing: make small screen letters 3/4 height

Browse source 
even though numbers are 1/3 and overlap is in theory possible; put 1/5
of extra space to left of letters so they don't hug the edge.
This commit is contained in:
Eric House 2012-07-10 21:04:54 -07:00
parent bfc68656cb
commit bad6c599f8
1 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -959,38 +959,35 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
descent += 2;
m_fillPaint.getTextBounds( text, 0, text.length(), m_boundsScratch );
if ( m_boundsScratch.width() > rect.width() ) {
int extra = rect.width() - m_boundsScratch.width();
if ( 0 >= extra ) {
m_fillPaint.setTextAlign( Paint.Align.LEFT );
drawScaled( text, rect, descent );
drawScaled( text, rect, m_boundsScratch, descent );
} else {
int bottom = rect.bottom - descent;
int origin = rect.left;
int origin = rect.left + (extra / 5);
if ( Paint.Align.CENTER == align ) {
origin += rect.width() / 2;
} else {
int right = m_boundsScratch.left + m_boundsScratch.width();
if ( right > rect.right ) {
origin -= m_boundsScratch.left;
}
origin -= m_boundsScratch.left;
}
m_fillPaint.setTextAlign( align );
m_canvas.drawText( text, origin, bottom, m_fillPaint );
}
} // drawCentered
private void drawScaled( String text, final Rect rect, int descent )
private void drawScaled( String text, final Rect rect,
Rect textBounds, int descent )
{
Rect local = new Rect();
m_fillPaint.getTextBounds( text, 0, text.length(), local );
local.bottom = rect.height();
textBounds.bottom = rect.height();
Bitmap bitmap = Bitmap.createBitmap( local.width(),
Bitmap bitmap = Bitmap.createBitmap( textBounds.width(),
rect.height(),
Bitmap.Config.ARGB_8888 );
Canvas canvas = new Canvas( bitmap );
int bottom = local.bottom - descent;
canvas.drawText( text, -local.left, bottom, m_fillPaint );
int bottom = textBounds.bottom - descent;
canvas.drawText( text, -textBounds.left, bottom, m_fillPaint );
m_canvas.drawBitmap( bitmap, null, rect, m_drawPaint );
}
@ -998,18 +995,11 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
private void positionDrawTile( final Rect rect, String text, int val )
{
if ( figureFontDims() ) {
int offset = m_hasSmallScreen ? 1 : 2;
final int offset = 2;
if ( null != text ) {
if ( null == m_letterRect ) {
int width = rect.width();
int height = rect.height();
if ( m_hasSmallScreen ) {
height = height * 2 / 3;
} else {
height = height * 3 / 4;
}
width -= offset;
m_letterRect = new Rect( 0, 0, width, height );
m_letterRect = new Rect( 0, 0, rect.width() - offset,
rect.height() * 3 / 4 );
}
m_letterRect.offsetTo( rect.left + offset, rect.top + offset );
drawIn( text, m_letterRect, m_fontDims, Paint.Align.LEFT );