diff --git a/app/src/main/java/com/picross/nonocross/views/grid/ColNumsView.kt b/app/src/main/java/com/picross/nonocross/views/grid/ColNumsView.kt index 4c971e7..a355d3c 100644 --- a/app/src/main/java/com/picross/nonocross/views/grid/ColNumsView.kt +++ b/app/src/main/java/com/picross/nonocross/views/grid/ColNumsView.kt @@ -30,7 +30,6 @@ class ColNumsView(context: Context) : AbstractNumsView(context) { private var initY = 0f private var transY = 0f private var oldTransY = 0f - private var mHeight = height @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent?): Boolean { @@ -44,7 +43,7 @@ class ColNumsView(context: Context) : AbstractNumsView(context) { transY = max( min( event.getY(0) - initY + oldTransY, - (LD.gridData.longestColNum * cellLength * 0.75f) * mScaleFactor - mHeight + (LD.gridData.longestColNum * cellLength * 1f) * mScaleFactor - height ), 0f ) invalidate() @@ -57,7 +56,7 @@ class ColNumsView(context: Context) : AbstractNumsView(context) { override fun onDraw(canvas: Canvas) { super.onDraw(canvas) canvas.save() - canvas.translate(mTransX, transY + mHeight * (1 - mScaleFactor)) + canvas.translate(mTransX, transY + height * (1 - mScaleFactor)) canvas.scale(mScaleFactor, mScaleFactor) if (refreshTemplates) { templateNumber = getTemplate(width, height, paintNumber) diff --git a/app/src/main/java/com/picross/nonocross/views/grid/RowNumsView.kt b/app/src/main/java/com/picross/nonocross/views/grid/RowNumsView.kt index e3c4e74..294a470 100644 --- a/app/src/main/java/com/picross/nonocross/views/grid/RowNumsView.kt +++ b/app/src/main/java/com/picross/nonocross/views/grid/RowNumsView.kt @@ -30,7 +30,6 @@ class RowNumsView(context: Context) : AbstractNumsView(context) { private var initX = 0f private var transX = 0f private var oldTransX = 0f - private var mWidth = width @SuppressLint("ClickableViewAccessibility") override fun onTouchEvent(event: MotionEvent?): Boolean { @@ -44,7 +43,7 @@ class RowNumsView(context: Context) : AbstractNumsView(context) { transX = max( min( event.getX(0) - initX + oldTransX, - (LD.gridData.longestRowNum * cellLength * 0.3f) * mScaleFactor - mWidth + (LD.gridData.longestRowNum * cellLength * 0.74f) * mScaleFactor - width ), 0f ) invalidate() @@ -57,7 +56,7 @@ class RowNumsView(context: Context) : AbstractNumsView(context) { override fun onDraw(canvas: Canvas) { super.onDraw(canvas) canvas.save() - canvas.translate(width * (1 - mScaleFactor) + transX, mTransY) + canvas.translate(transX + width * (1 - mScaleFactor), mTransY) canvas.scale(mScaleFactor, mScaleFactor) if (refreshTemplates) { templateNumber = getTemplate(width, height, paintNumber)