From d347bb190c963adcd90e63b97df0322ef6cec783 Mon Sep 17 00:00:00 2001 From: 7015725 Date: Sat, 23 May 2026 05:27:10 +0800 Subject: [PATCH] Reduce ToolApp back visual displacement --- code/th_15_extra.js | 22 ++++++++++------------ manifest.json | 6 +++--- manifest.sig | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/code/th_15_extra.js b/code/th_15_extra.js index 4234ac3..19fffcf 100644 --- a/code/th_15_extra.js +++ b/code/th_15_extra.js @@ -1111,10 +1111,9 @@ FloatBallAppWM.prototype.applyToolAppBackPreviewProgress = function(edge, progre if (body) { try { body.animate().cancel(); } catch(eCancelBody) {} body.setTranslationX(bodyMove); - body.setAlpha(1.0 - 0.10 * eased); - var s = 1.0 - 0.015 * eased; - body.setScaleX(s); - body.setScaleY(s); + body.setAlpha(1.0); + body.setScaleX(1.0); + body.setScaleY(1.0); } try { @@ -1136,11 +1135,10 @@ FloatBallAppWM.prototype.applyToolAppBackPreviewProgress = function(edge, progre } } catch(eMoveLog) {} if (prev) { - prev.setAlpha(0.88 + 0.12 * eased); - prev.setTranslationX(-dir * this.dp(24) * (1.0 - eased)); - var ps = 0.975 + 0.025 * eased; - prev.setScaleX(ps); - prev.setScaleY(ps); + prev.setAlpha(1.0); + prev.setTranslationX(0); + prev.setScaleX(1.0); + prev.setScaleY(1.0); } return true; } catch (e) { safeLog(this.L, 'w', "apply tool app back preview fail: " + String(e)); } @@ -1162,8 +1160,8 @@ FloatBallAppWM.prototype.finishToolAppBackPreview = function(edge, complete) { try { w = Number((this.state.toolAppRoot && this.state.toolAppRoot.getWidth && this.state.toolAppRoot.getWidth()) || 0); } catch (eW1) {} } if (!w || w < this.dp(120)) w = this.dp(320); - try { if (prev) prev.animate().translationX(0).alpha(1).scaleX(1).scaleY(1).setDuration(180).setInterpolator(decel).start(); } catch(ePrev) {} - body.animate().translationX(dir * w).alpha(0.90).scaleX(0.985).scaleY(0.985).setDuration(180).setInterpolator(decel).withEndAction(new java.lang.Runnable({ + try { if (prev) prev.animate().translationX(0).alpha(1).scaleX(1).scaleY(1).setDuration(120).setInterpolator(decel).start(); } catch(ePrev) {} + body.animate().translationX(dir * w).alpha(1).scaleX(1).scaleY(1).setDuration(160).setInterpolator(decel).withEndAction(new java.lang.Runnable({ run: function() { try { self.resetToolAppBackWindowFollow(); } catch(eResetFollow) {} try { self.state.keepToolAppBackPreviewDuringPop = true; } catch(eKeepPreview) {} @@ -1202,7 +1200,7 @@ FloatBallAppWM.prototype.finishToolAppBackPreview = function(edge, complete) { } if (body) { var cancelInterp = new android.view.animation.AccelerateDecelerateInterpolator(); - try { if (prev) prev.animate().translationX(-dir * self.dp(24)).alpha(0.88).scaleX(0.975).scaleY(0.975).setDuration(200).setInterpolator(cancelInterp).start(); } catch(ePrev2) {} + try { if (prev) prev.animate().translationX(0).alpha(1).scaleX(1).scaleY(1).setDuration(160).setInterpolator(cancelInterp).start(); } catch(ePrev2) {} body.animate().translationX(0).alpha(1).scaleX(1).scaleY(1).setDuration(200).setInterpolator(cancelInterp).withEndAction(new java.lang.Runnable({ run: function() { try { self.resetToolAppBackWindowFollow(); } catch(eResetFollow2) {} diff --git a/manifest.json b/manifest.json index 3b2fbe3..814dbca 100644 --- a/manifest.json +++ b/manifest.json @@ -70,8 +70,8 @@ "size": 20484 }, "th_15_extra.js": { - "sha256": "68e12dcfb256e04c5eb0173a3eab9a9e17a84d3ea5fcf5c6acf56577e2e11b5f", - "size": 128721 + "sha256": "a8956615053d1147001103b4ed69e3f18ccb09a760314a5f8f1c21a3b5b8e8c5", + "size": 128551 }, "th_16_entry.js": { "sha256": "652aa70214a9419923785e528a067d3828094fde48fc9c8c57cfda1e08206e25", @@ -80,5 +80,5 @@ }, "keyId": "toolhub-targets-2026-rsa3072", "schema": 2, - "version": 20260522212030 + "version": 20260522212705 } diff --git a/manifest.sig b/manifest.sig index 3ebfb68..a04c57e 100644 --- a/manifest.sig +++ b/manifest.sig @@ -1 +1 @@ -l6g96ONK62lSIYRjTLnG/nA4ANJWb3qnE/ImWR93y5E0O+Wbd/2yPDbnrIuPRSVD7aId9O/0wO+rYQSurHfXBTF5rt40r3U4HMYNQRw0bb/34VdV/ZG8z6C2WXv9T3OjaRedqKWkH0HcE9Z8hurOveBDbR1CtWUVgHPQ6AuCkfRWyzMK378B4EXbd9XoODzg6wOECt8qRecLHvVOb0bU5THqoSSnLwZQ+ZNsqNGLn/T7BGe3i4vEadxzjumxwh7PoK/VZBaip/1jxHRPKtq5sVZu4qzv3FBqUh4ndBoNyiMmdEQNZeC9ETG2WB9M+2Oixrv4Dds4c9yabZt1NxA9v1/Fbv4lqDw6Be9gt/d8ZnffuWgN1HJvqMtmwRdIXRAJ+F2U47FGjv5v4eBYplWma9POz8pc/K5kkLFxaObYunNYVDmjlLRk4gC+nEOXbHMJxJJ3MiPc8ImuccblTHEWXKFFLZY6m7+2nq9VFqGdiG/c0fJrDefJaIFgC6tB6ruw +VCM+YNBx7CB7ZIChrltA70VVOKjn9gGgBOaeXEoN0VL88UoyPlGZ4W74cORCUBF2JpcIEr5WE8ueDl3IGUR1OGQDopoIuOI6wXy/doducwtjJrZoPB5p8JW4iasBerss97lKc+r/B7N5n1P33vRvpezXMwEBERG9Ey0gSUR/SWuozsW8fWk9oTWt0jgQQx+fJCmb2eSePm2XRlPWPLKT36XOJGWq/knlmhIOlW3/2VusDzN8rDfSxpEPLTFOZPav9PYh+6MBaJjV2+JLiROH60XW0AFnBMxmL2/c4BzzkC9+10sc3ZJUq3V8C30NZpXYiTfDN0i5yCEbd3OGrQb3soqZbqHWVhaWiFCH7nLYltWeTltHtb/obXcG4Wi3YPYjme7xGrPxO1dAid3U1/q4ajM4L04riij+2BHU4+uBCNstpIi8nx+3R8k7OYsDmp/tpFLDC9q1ib+UUQOcCAT7k9Pw71jdgJKKNcqyZb17zm0fCqbkiNvh6pz2hRX/533Y