Skip to content

In the trigger or action list, scroll attempts move items too easily #2149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sds100 merged 2 commits into from
Jun 1, 2026
Merged

In the trigger or action list, scroll attempts move items too easily #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28691a
#2074 fix: scope item drag to handle only, restoring list scroll
claude May 31, 2026
bcd72c8
Merge branch 'develop' into claude/issue-2074-fix-scroll-drag
sds100 Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## [4.2.0](https://github.com/sds100/KeyMapper/releases/tag/v4.2.0)

## Fixed

- #2074 Scrolling the action or trigger list no longer accidentally moves items; reordering by drag now only activates from the drag handle or via long-press.

## Changed

- #1369 Add content descriptions to drag handles and custom "Move up"/"Move down" accessibility actions for trigger and action list items, improving TalkBack support for reordering.
Expand Down
23 changes: 12 additions & 11 deletions base/src/main/java/io/github/sds100/keymapper/base/actions/ActionListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@ fun ActionListItem(
.heightIn(min = 48.dp)
.height(IntrinsicSize.Min)
.padding(start = 16.dp, end = 16.dp)
.draggable(
state = draggableState,
enabled = isDraggingEnabled,
orientation = Orientation.Vertical,
startDragImmediately = false,
onDragStarted = { offset ->
dragDropState?.onDragStart(index, offset)
},
onDragStopped = { dragDropState?.onDragInterrupted() },
)
.semantics {
if (isReorderingEnabled) {
customActions = buildList {
Expand Down Expand Up @@ -130,7 +120,18 @@ fun ActionListItem(

if (isReorderingEnabled) {
Icon(
modifier = Modifier.size(24.dp),
modifier = Modifier
.size(24.dp)
.draggable(
state = draggableState,
enabled = isDraggingEnabled,
orientation = Orientation.Vertical,
startDragImmediately = true,
onDragStarted = { offset ->
dragDropState?.onDragStart(index, offset)
},
onDragStopped = { dragDropState?.onDragInterrupted() },
),
imageVector = Icons.Rounded.DragHandle,
contentDescription = stringResource(R.string.drag_handle_for, model.text),
tint = MaterialTheme.colorScheme.onSurface,
Expand Down
23 changes: 12 additions & 11 deletions base/src/main/java/io/github/sds100/keymapper/base/trigger/TriggerKeyListItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@ fun TriggerKeyListItem(
.heightIn(min = 48.dp)
.height(IntrinsicSize.Min)
.padding(start = 16.dp, end = 16.dp)
.draggable(
state = draggableState,
enabled = isDraggingEnabled,
orientation = Orientation.Vertical,
startDragImmediately = false,
onDragStarted = { offset ->
dragDropState?.onDragStart(index, offset)
},
onDragStopped = { dragDropState?.onDragInterrupted() },
)
.semantics {
if (isReorderingEnabled) {
customActions = buildList {
Expand Down Expand Up @@ -130,7 +120,18 @@ fun TriggerKeyListItem(

if (isReorderingEnabled) {
Icon(
modifier = Modifier.size(24.dp),
modifier = Modifier
.size(24.dp)
.draggable(
state = draggableState,
enabled = isDraggingEnabled,
orientation = Orientation.Vertical,
startDragImmediately = true,
onDragStarted = { offset ->
dragDropState?.onDragStart(index, offset)
},
onDragStopped = { dragDropState?.onDragInterrupted() },
),
imageVector = Icons.Rounded.DragHandle,
contentDescription = stringResource(R.string.drag_handle_for, primaryText),
tint = MaterialTheme.colorScheme.onSurface,
Expand Down
Loading