armsx/ARMSX3
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX3.git synced 2026-08-24 16:58:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Touch editor: dock the panel away from the widget being edited

Browse Source 
I left this out when porting the collapse toggle, on the grounds that ARMSX2
found docking alone did not answer the complaint. That was right about docking
being insufficient and wrong about it being unnecessary -- the two cover
different halves of the same problem. Collapse answers 'I cannot select what
is under you in the first place'; docking answers 'I have selected it and now
you are sitting on top of it'.

Selecting a widget in the top half moves the panel to the bottom, and back
again otherwise. Halves rather than real overlap maths, on purpose: a panel
that darts about as rectangles graze each other is less predictable than one
that is simply never on the side being worked on.

The stored drag offset means 'away from the anchored edge', so it flips sign
with the anchor. ARMSX3 anchors the panel top-centre and offsets downward, so
while docked to the bottom a +dy the user had nudged in would otherwise push
the panel straight off the screen.

Note for testing: this is only visible when selecting a widget in the TOP
half. Most on-screen controls live in the lower half, so selecting a face
button correctly leaves the panel where it is -- which is indistinguishable
from nothing happening. Use a shoulder button.
This commit is contained in:
jpolo1224
2026-08-24 17:03:07 -04:00
parent 03b5bde716
commit 4bf82b6df0
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/armsx3-ui/app/src/main/java/com/armsx2/ui/touch/TouchControlsOverlay.kt
+24 -3
View File
@@ -424,12 +424,33 @@ fun TouchControlsOverlay() {
val dxState = TouchControls.editorPanelDx(isLandscape)
val dyState = TouchControls.editorPanelDy(isLandscape)
val panelScale = TouchControls.editorPanelScale(isLandscape).floatValue
// Auto-dock: never sit on the same half of the screen as the widget being edited.
//
// Halves rather than real overlap maths, on purpose. A panel that darts about as
// rectangles graze each other is less predictable than one that is simply never on
// the side you are working on, and predictability is what makes it stop being
// annoying.
//
// This complements the collapse toggle rather than replacing it: collapse answers "I
// cannot select what is under you in the first place", docking answers "I have
// selected it and now you are on top of it".
val selectedId = TouchControls.selectedButton.value
val selectedY = if (selectedId != null) {
TouchControls.activeLayout.value.buttons.firstOrNull { it.id == selectedId }?.yFrac
} else null
val dockBottom = selectedY != null && selectedY < 0.5f
Box(
Modifier
.align(Alignment.TopCenter)
.padding(top = 12.dp)
.align(if (dockBottom) Alignment.BottomCenter else Alignment.TopCenter)
.padding(top = if (dockBottom) 0.dp else 12.dp, bottom = if (dockBottom) 12.dp else 0.dp)
.offset {
IntOffset(dxState.floatValue.roundToInt(), dyState.floatValue.roundToInt())
// The stored drag offset means "away from the anchored edge", so it has to
// flip sign with the anchor. Applied unchanged while docked to the bottom,
// a +dy the user had nudged in would push the panel straight off-screen.
val dy = if (dockBottom) -dyState.floatValue else dyState.floatValue
IntOffset(dxState.floatValue.roundToInt(), dy.roundToInt())
},
) {
CompositionLocalProvider(