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

don't display zoom control at all if both buttons disabled.

Browse source
This commit is contained in:
eehouse 2010-06-02 04:59:51 +00:00
parent 68bf571f26
commit bcac60b2d4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
private int[] m_otherColors; private int[] m_otherColors;
private ZoomButtonsController m_zoomButtons; private ZoomButtonsController m_zoomButtons;
private boolean m_useZoomControl; private boolean m_useZoomControl;
private boolean m_canZoom;
// called when inflating xml // called when inflating xml
public BoardView( Context context, AttributeSet attrs ) public BoardView( Context context, AttributeSet attrs )
@ -130,13 +131,13 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
switch ( action ) { switch ( action ) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
if ( m_useZoomControl ) { if ( m_useZoomControl && m_canZoom ) {
m_zoomButtons.setVisible( true ); m_zoomButtons.setVisible( true );
} }
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_DOWN, xx, yy ); m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_DOWN, xx, yy );
break; break;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
if ( m_useZoomControl ) { if ( m_useZoomControl && m_canZoom ) {
m_zoomButtons.setVisible( true ); m_zoomButtons.setVisible( true );
} }
m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_MOVE, xx, yy ); m_jniThread.handle( JNIThread.JNICmd.CMD_PEN_MOVE, xx, yy );
@ -220,7 +221,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
protected void setUseZoomControl( boolean useZoomControl ) protected void setUseZoomControl( boolean useZoomControl )
{ {
m_useZoomControl = useZoomControl; m_useZoomControl = useZoomControl;
if ( !m_useZoomControl ) { if ( !useZoomControl ) {
m_zoomButtons.setVisible( false ); m_zoomButtons.setVisible( false );
} }
} }
@ -344,6 +345,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
public void run() { public void run() {
m_zoomButtons.setZoomInEnabled( canZoom[0] ); m_zoomButtons.setZoomInEnabled( canZoom[0] );
m_zoomButtons.setZoomOutEnabled( canZoom[1] ); m_zoomButtons.setZoomOutEnabled( canZoom[1] );
m_canZoom = canZoom[0] || canZoom[1];
} }
} ); } );
} }