layout: Take into account text purpose again

This commit is contained in:
Dorota Czaplejewicz
2021-04-05 08:17:07 +00:00
parent acac00bc88
commit 93e4345e82

View File

@ -239,13 +239,18 @@ fn load_layout_data_with_fallback(
.map(PathBuf::from) .map(PathBuf::from)
.or_else(|| xdg::data_path("squeekboard/keyboards")); .or_else(|| xdg::data_path("squeekboard/keyboards"));
log_print!( let layout_purpose = match overlay {
logging::Level::Debug, "" => match purpose {
"load_layout_data_with_fallback() -> name:{}, purpose:{:?}, overlay:{}, layout_name:{}", ContentPurpose::Number => "number",
name, purpose, overlay, &name ContentPurpose::Digits => "number",
); ContentPurpose::Phone => "number",
ContentPurpose::Terminal => "terminal",
_ => "",
},
overlay => overlay,
};
for (kind, source) in list_layout_sources(&name, kind, overlay, path) { for (kind, source) in list_layout_sources(&name, kind, layout_purpose, path) {
let layout = load_layout_data(source.clone()); let layout = load_layout_data(source.clone());
match layout { match layout {
Err(e) => match (e, source) { Err(e) => match (e, source) {