xarus/nonocross
1
0
Fork 0
forked from mirrors/nonocross
Code Pull Requests Activity

fixe annotations on zoom

Browse Source
This commit is contained in:
Xarus
2024-05-13 21:49:01 -07:00
parent e00a329456
commit c0d615dbd0
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/picross/nonocross/views/grid/ColNumsView.kt
View File

@@ -30,7 +30,6 @@ class ColNumsView(context: Context) : AbstractNumsView(context) {
private var initY = 0f private var initY = 0f
private var transY = 0f private var transY = 0f
private var oldTransY = 0f private var oldTransY = 0f
private var mHeight = height
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent?): Boolean { override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -44,7 +43,7 @@ class ColNumsView(context: Context) : AbstractNumsView(context) {
transY = max( transY = max(
min( min(
event.getY(0) - initY + oldTransY, event.getY(0) - initY + oldTransY,
(LD.gridData.longestColNum * cellLength * 0.75f) * mScaleFactor - mHeight (LD.gridData.longestColNum * cellLength * 1f) * mScaleFactor - height
), 0f ), 0f
) )
invalidate() invalidate()
@@ -57,7 +56,7 @@ class ColNumsView(context: Context) : AbstractNumsView(context) {
override fun onDraw(canvas: Canvas) { override fun onDraw(canvas: Canvas) {
super.onDraw(canvas) super.onDraw(canvas)
canvas.save() canvas.save()
canvas.translate(mTransX, transY + mHeight * (1 - mScaleFactor)) canvas.translate(mTransX, transY + height * (1 - mScaleFactor))
canvas.scale(mScaleFactor, mScaleFactor) canvas.scale(mScaleFactor, mScaleFactor)
if (refreshTemplates) { if (refreshTemplates) {
templateNumber = getTemplate(width, height, paintNumber) templateNumber = getTemplate(width, height, paintNumber)

5
app/src/main/java/com/picross/nonocross/views/grid/RowNumsView.kt
View File

@@ -30,7 +30,6 @@ class RowNumsView(context: Context) : AbstractNumsView(context) {
private var initX = 0f private var initX = 0f
private var transX = 0f private var transX = 0f
private var oldTransX = 0f private var oldTransX = 0f
private var mWidth = width
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent?): Boolean { override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -44,7 +43,7 @@ class RowNumsView(context: Context) : AbstractNumsView(context) {
transX = max( transX = max(
min( min(
event.getX(0) - initX + oldTransX, event.getX(0) - initX + oldTransX,
(LD.gridData.longestRowNum * cellLength * 0.3f) * mScaleFactor - mWidth (LD.gridData.longestRowNum * cellLength * 0.74f) * mScaleFactor - width
), 0f ), 0f
) )
invalidate() invalidate()
@@ -57,7 +56,7 @@ class RowNumsView(context: Context) : AbstractNumsView(context) {
override fun onDraw(canvas: Canvas) { override fun onDraw(canvas: Canvas) {
super.onDraw(canvas) super.onDraw(canvas)
canvas.save() canvas.save()
canvas.translate(width * (1 - mScaleFactor) + transX, mTransY) canvas.translate(transX + width * (1 - mScaleFactor), mTransY)
canvas.scale(mScaleFactor, mScaleFactor) canvas.scale(mScaleFactor, mScaleFactor)
if (refreshTemplates) { if (refreshTemplates) {
templateNumber = getTemplate(width, height, paintNumber) templateNumber = getTemplate(width, height, paintNumber)