Skip to content

Fix LT-22136: Hide WS should not change the order of WSs #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtmaxwell3 merged 2 commits into from
Jun 26, 2025
Merged

Fix LT-22136: Hide WS should not change the order of WSs #379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a35aca3
Fix LT-22136: Hide WS should not change the order of WSs
jtmaxwell3 Jun 26, 2025
35fbcb0
Merge branch 'release/9.3' into LT-22136
mark-sil Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Src/FwCoreDlgs/FwWritingSystemSetupModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,8 @@ public FwWritingSystemSetupModel(IWritingSystemContainer container, ListType typ
private List<WSListItemModel> BuildWorkingList(ICollection<CoreWritingSystemDefinition> allForType, IList<CoreWritingSystemDefinition> currentForType)
{
var list = new List<WSListItemModel>();
// We prefer to display the current ones first, because that's what the code that orders them
// in the lexical data fields does. Usually this happens automatically, but there have
// been cases where the order is different in the two lists, even if they have the same items.
var wssInPreferredOrder = currentForType.Concat(allForType.Except(currentForType));
// Don't reorder the writing systems here even though the lexical data fields are reordered (cf. LT-22136).
var wssInPreferredOrder = allForType;
foreach (var ws in wssInPreferredOrder)
{
list.Add(new WSListItemModel(currentForType.Contains(ws), ws, new CoreWritingSystemDefinition(ws, true)));
Expand Down
Loading