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

data: Flattened layout fallback function

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-12-03 15:47:44 +00:00
parent 103e64b96c
commit cc4f14e8c6
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/data.rs
View File

@ -128,41 +128,36 @@ fn list_layout_sources(
ret ret
}; };
let ret = { fn name_with_arrangement(name: String, kind: &ArrangementKind) -> String {
fn name_with_arrangement(name: String, kind: &ArrangementKind) match kind {
-> String ArrangementKind::Base => name,
{ ArrangementKind::Wide => name + "_wide",
match kind {
ArrangementKind::Base => name,
ArrangementKind::Wide => name + "_wide",
}
} }
}
let ret = Vec::new(); let ret = Vec::new();
let ret = match &kind { let ret = match &kind {
ArrangementKind::Base => ret, ArrangementKind::Base => ret,
kind => add_by_name( kind => add_by_name(
ret, ret,
&name_with_arrangement(name.into(), &kind), &name_with_arrangement(name.into(), &kind),
&kind, &kind,
), ),
};
let ret = add_by_name(ret, name, &ArrangementKind::Base);
let ret = match &kind {
ArrangementKind::Base => ret,
kind => add_by_name(
ret,
&name_with_arrangement(FALLBACK_LAYOUT_NAME.into(), &kind),
&kind,
),
};
add_by_name(ret, FALLBACK_LAYOUT_NAME, &ArrangementKind::Base)
}; };
ret
let ret = add_by_name(ret, name, &ArrangementKind::Base);
let ret = match &kind {
ArrangementKind::Base => ret,
kind => add_by_name(
ret,
&name_with_arrangement(FALLBACK_LAYOUT_NAME.into(), &kind),
&kind,
),
};
add_by_name(ret, FALLBACK_LAYOUT_NAME, &ArrangementKind::Base)
} }
fn load_layout_data(source: DataSource) fn load_layout_data(source: DataSource)