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

Merge branch 'popover-sorting' into 'master'

Browse Source 
Sort layouts by type before sorting by name

Closes #176

See merge request Librem5/squeekboard!384
This commit is contained in:
Dorota Czaplejewicz
2020-10-07 15:23:25 +00:00
parent 776c0c5f4b 93ac94b83f
commit d283ced2ce
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/popover.rs
View File

@ -3,6 +3,7 @@
use gio; use gio;
use gtk; use gtk;
use std::ffi::CString; use std::ffi::CString;
use std::cmp::Ordering;
use ::layout::c::{ Bounds, EekGtkKeyboard }; use ::layout::c::{ Bounds, EekGtkKeyboard };
use ::locale; use ::locale;
use ::locale::{ OwnedTranslation, Translation, compare_current_locale }; use ::locale::{ OwnedTranslation, Translation, compare_current_locale };
@ -334,8 +335,13 @@ pub fn show(
.zip(all_layouts.clone().into_iter()) .zip(all_layouts.clone().into_iter())
.collect(); .collect();
human_names.sort_unstable_by(|(tr_a, _), (tr_b, _)| { human_names.sort_unstable_by(|(tr_a, layout_a), (tr_b, layout_b)| {
compare_current_locale(&tr_a.0, &tr_b.0) // Sort first by layout then name
match (layout_a, layout_b) {
(LayoutId::Local(_), LayoutId::System { .. }) => Ordering::Greater,
(LayoutId::System { .. }, LayoutId::Local(_)) => Ordering::Less,
_ => compare_current_locale(&tr_a.0, &tr_b.0)
}
}); });
// GVariant doesn't natively support `enum`s, // GVariant doesn't natively support `enum`s,