Skip to content
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

Rework space bar confirmation support #11288

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Rework space bar confirmation support #11288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 14 additions & 19 deletions src/QmlControls/SliderSwitch.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,23 @@ Rectangle {
property real _diameter: height - (_border * 2)
property real _dragStartX: _border
property real _dragStopX: _root.width - (_diameter + _border)
property bool _waitingForLastAutoRepeat: false

Keys.onSpacePressed: (event) => {
if (visible && event.modifiers === Qt.NoModifier && event.isAutoRepeat && !sliderDragArea.drag.active) {
if (visible && event.modifiers === Qt.NoModifier && !sliderDragArea.drag.active) {
event.accepted = true
if (_waitingForLastAutoRepeat) {
resetSpaceBarSliding()
accept()
} else {
sliderAnimation.start()
spaceBarTimout.restart()
}
sliderAnimation.start()
}
}

function resetSpaceBarSliding() {
_waitingForLastAutoRepeat = false
spaceBarTimout.stop()
slider.reset()
Keys.onReleased: (event) => {
if (visible && event.key === Qt.Key_Space) {
event.accepted = true
resetSpaceBarSliding()
}
}

Timer {
id: spaceBarTimout
interval: 200
repeat: false
onTriggered: _root.resetSpaceBarSliding()
function resetSpaceBarSliding() {
slider.reset()
}

QGCPalette { id: qgcPal; colorGroupEnabled: true }
Expand Down Expand Up @@ -90,7 +81,11 @@ Rectangle {
from: _dragStartX
to: _dragStopX
running: false
onFinished: _waitingForLastAutoRepeat = true

onFinished: {
slider.reset()
_root.accept()
}
}

function reset() {
Expand Down
Loading