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

layout: Remove the little abomination of view change promise

Browse Source 
It didn't make anything more testable due to being tightly coupled to Layout.
With the last place needing the curent form abolished, it's no longer needed.

No attempt to make it more stateless and unit-testable was made though.
This commit is contained in:
Dorota Czaplejewicz
2020-12-03 19:56:48 +00:00
parent 8ab6997b21
commit e36c4e597f
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/layout.rs
View File

@ -837,14 +837,13 @@ impl Layout {
self.view_latched, self.view_latched,
); );
self.view_latched = new_latched;
match transition { match transition {
ViewTransition::UnlatchAll => unstick_locks(self).apply(), ViewTransition::UnlatchAll => unstick_locks(self),
ViewTransition::ChangeTo(view) => { ViewTransition::ChangeTo(view) => try_set_view(self, view.into()),
try_set_view(self, view.into());
},
ViewTransition::NoChange => {}, ViewTransition::NoChange => {},
}; };
self.view_latched = new_latched;
} }
/// Last bool is new latch state. /// Last bool is new latch state.
@ -907,31 +906,18 @@ fn try_set_view(layout: &mut Layout, view_name: String) {
); );
} }
/// A vessel holding an obligation to switch view.
/// Use with #[must_use]
struct ViewChange<'a> {
layout: &'a mut Layout,
view_name: Option<String>,
}
impl<'a> ViewChange<'a> {
fn apply(self) {
if let Some(name) = self.view_name {
try_set_view(self.layout, name);
}
}
}
/// Find all impermanent view changes and undo them in an arbitrary order. /// Find all impermanent view changes and undo them in an arbitrary order.
/// Return an obligation to actually switch the view.
/// The final view is the "unlock" view /// The final view is the "unlock" view
/// from one of the currently stuck keys. /// from one of the currently latched keys.
// As long as only one stuck button is used, this should be fine. // As long as only one stuck button is used, this should be fine.
// This is guaranteed because pressing a lock button unlocks all others. // This is guaranteed because pressing a lock button unlocks all others.
// TODO: Make some broader guarantee about the resulting view, // TODO: Make some broader guarantee about the resulting view,
// e.g. by maintaining a stack of stuck keys. // e.g. by maintaining a stack of stuck keys.
#[must_use] fn unstick_locks(layout: &mut Layout) {
fn unstick_locks(layout: &mut Layout) -> ViewChange { if !layout.view_latched {
return;
}
let mut new_view = None; let mut new_view = None;
for key in layout.get_locked_keys().clone() { for key in layout.get_locked_keys().clone() {
let key: &Rc<RefCell<KeyState>> = key.borrow(); let key: &Rc<RefCell<KeyState>> = key.borrow();
@ -948,9 +934,8 @@ fn unstick_locks(layout: &mut Layout) -> ViewChange {
}; };
} }
ViewChange { if let Some(name) = new_view {
layout, try_set_view(layout, name);
view_name: new_view,
} }
} }