linshenjianlu/ShortX_ToolHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: keep docked ball on edge while dragging

Browse Source
This commit is contained in:
7015725
2026-05-07 23:06:23 +08:00
parent 637858ab9c
commit 8f6dcdcac1
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
code/th_15_extra.js
View File

@@ -1222,18 +1222,6 @@ FloatBallAppWM.prototype.setupTouchListener = function() {
} catch (e) { return 0; } } catch (e) { return 0; }
} }
function prepareFullBallAt(x, y, di) {
try {
self.state.docked = false;
self.state.dockSide = null;
self.state.ballLp.width = di.ballSize;
self.state.ballLp.x = self.clamp(Math.round(x), 0, self.state.screen.w - di.ballSize);
self.state.ballLp.y = self.clamp(Math.round(y), 0, self.state.screen.h - di.ballSize);
try { self.state.ballContent.setX(0); } catch (eX) {}
try { self.state.ballContent.setAlpha(1.0); } catch (eA) {}
try { self.state.ballContent.setScaleX(1.0); self.state.ballContent.setScaleY(1.0); } catch (eS) {}
} catch (e) { safeLog(null, "e", "prepareFullBallAt fail: " + String(e)); }
}
return new JavaAdapter(android.view.View.OnTouchListener, { return new JavaAdapter(android.view.View.OnTouchListener, {
onTouch: function(v, e) { onTouch: function(v, e) {
@@ -1297,20 +1285,36 @@ FloatBallAppWM.prototype.setupTouchListener = function() {
self.cancelLongPressTimer(); self.cancelLongPressTimer();
try { self.hideAllPanels(); } catch (eHide) {} try { self.hideAllPanels(); } catch (eHide) {}
cancelBallAnimator(); cancelBallAnimator();
if (downDocked) prepareFullBallAt(logicalDownX, logicalDownY, di); // 吸边态拖拽不再弹出完整球；先保持可见条沿边移动，彻底避免“弹到手指处”的首帧闪现。
} }
} }
if (self.state.dragging) { if (self.state.dragging) {
var targetX = Math.round(curRawX - grabOffsetX); if (downDocked) {
var targetY = Math.round(curRawY - grabOffsetY); var edgeY = self.clamp(logicalDownY + dy, 0, self.state.screen.h - di.ballSize);
self.state.docked = false; self.state.docked = true;
self.state.dockSide = null; self.state.dockSide = downDockSide || self.state.dockSide || "right";
self.state.ballLp.width = di.ballSize; self.state.ballLp.width = di.visiblePx;
self.state.ballLp.x = self.clamp(targetX, 0, self.state.screen.w - di.ballSize); self.state.ballLp.y = edgeY;
self.state.ballLp.y = self.clamp(targetY, 0, self.state.screen.h - di.ballSize); if (self.state.dockSide === "left") {
try { self.state.ballContent.setX(0); } catch (eX2) {} self.state.ballLp.x = 0;
try { self.state.ballContent.setAlpha(1.0); } catch (eA2) {} try { self.state.ballContent.setX(-di.hiddenPx); } catch (eLX) {}
} else {
self.state.ballLp.x = self.state.screen.w - di.visiblePx;
try { self.state.ballContent.setX(0); } catch (eRX) {}
}
try { self.state.ballContent.setAlpha(1.0); } catch (eAEdge) {}
} else {
var targetX = Math.round(curRawX - grabOffsetX);
var targetY = Math.round(curRawY - grabOffsetY);
self.state.docked = false;
self.state.dockSide = null;
self.state.ballLp.width = di.ballSize;
self.state.ballLp.x = self.clamp(targetX, 0, self.state.screen.w - di.ballSize);
self.state.ballLp.y = self.clamp(targetY, 0, self.state.screen.h - di.ballSize);
try { self.state.ballContent.setX(0); } catch (eX2) {}
try { self.state.ballContent.setAlpha(1.0); } catch (eA2) {}
}
var now = java.lang.System.currentTimeMillis(); var now = java.lang.System.currentTimeMillis();
if (lastUpdateTs === 0 || now - lastUpdateTs > 10) { if (lastUpdateTs === 0 || now - lastUpdateTs > 10) {