s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix' into 'master'

Browse Source 
layout: Improve scoping of locked variable

See merge request Librem5/squeekboard!329
This commit is contained in:
Sebastian Krzyszkowiak
2020-02-05 13:19:19 +00:00
parent a0a2e40fa0 c766fae686
commit 41be2747d5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/layout.rs
View File

@ -910,7 +910,6 @@ mod seat {
// update // update
let key = key.into_released(); let key = key.into_released();
let mut locked = key.action.is_locked(&layout.current_view);
// process changes // process changes
match action { match action {
@ -924,12 +923,12 @@ mod seat {
try_set_view(layout, view) try_set_view(layout, view)
}, },
Action::LockView { lock, unlock } => { Action::LockView { lock, unlock } => {
locked ^= true; let gets_locked = !key.action.is_locked(&layout.current_view);
unstick_locks(layout) unstick_locks(layout)
// It doesn't matter what the resulting view should be, // It doesn't matter what the resulting view should be,
// it's getting changed anyway. // it's getting changed anyway.
.choose_view( .choose_view(
match locked { match gets_locked {
true => lock.clone(), true => lock.clone(),
false => unlock.clone(), false => unlock.clone(),
} }