From ee702e50901d90cd842dbd88154687bd2512b52c Mon Sep 17 00:00:00 2001
From: Todd York <tjysunset@outlook.com>
Date: Sat, 17 Jan 2026 19:14:37 +0800
Subject: [PATCH] Reorder fields in FontMatchKey to fix fallback logic; Add
 comments

---
 src/font/system.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/font/system.rs b/src/font/system.rs
index b73f616..2d19743 100644
--- a/src/font/system.rs
+++ b/src/font/system.rs
@@ -15,20 +15,23 @@ pub use harfrust;
 
 use super::fallback::{Fallback, Fallbacks, MonospaceFallbackInfo, PlatformFallback};
 
+// The fields are used in the derived Ord implementation for sorting fallback candidates.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct FontMatchKey {
     pub(crate) not_emoji: bool,
     pub(crate) font_weight_diff: u16,
-    pub(crate) font_weight: u16,
     pub(crate) font_stretch_diff: u16,
-    pub(crate) font_stretch: u16,
     pub(crate) font_style_diff: u8,
+    pub(crate) font_weight: u16,
+    pub(crate) font_stretch: u16,
     pub(crate) id: fontdb::ID,
 }
 
 impl FontMatchKey {
     fn new(attrs: &Attrs, face: &FaceInfo) -> FontMatchKey {
+        // TODO: smarter way of detecting emoji
         let not_emoji = !face.post_script_name.contains("Emoji");
+        // TODO: correctly take variable axes into account
         let font_weight_diff = attrs.weight.0.abs_diff(face.weight.0);
         let font_weight = face.weight.0;
         let font_stretch_diff = attrs.stretch.to_number().abs_diff(face.stretch.to_number());
@@ -47,10 +50,10 @@ impl FontMatchKey {
         FontMatchKey {
             not_emoji,
             font_weight_diff,
-            font_weight,
             font_stretch_diff,
-            font_stretch,
             font_style_diff,
+            font_weight,
+            font_stretch,
             id,
         }
     }