bugfix with fret finger text size not changed after resizing window

Author: yjpark

crates/notation_bevy/src/guitar/fret_finger.rs

@@ -161,7 +161,7 @@ impl FretFingerData {
         assets: &NotationAssets,
         theme: &NotationTheme,
         settings: &NotationSettings,
-        font_query: &mut Query<(&Parent, &mut Text)>,
+        text_query: &Query<(&Parent, Entity), With<Text>>,
         entity: Entity,
         meta: &TabMeta,
     ) {
@@ -172,28 +172,22 @@ impl FretFingerData {
         } else {
             meta.key.transpose(Semitones(self.value.extra.capo as i8))
         };
+        for (parent, text_entity) in text_query.iter() {
+            if parent.0 == entity {
+                commands.entity(text_entity).despawn();
+            }
+        }
         if settings.show_guitar_syllable && self.value.extra.fret.is_some() {
             let syllable = self.value.calc_syllable();
-            let mut exist = false;
-            for (parent, mut text) in font_query.iter_mut() {
-                if parent.0 == entity {
-                    exist = true;
-                    let v = MelodyTexts::calc_text(settings, &meta.scale, &key, &syllable);
-                    BevyUtil::set_text_value(&mut text, v);
-                    break;
-                }
-            }
-            if !exist {
-                theme.guitar.syllable_text.spawn_scaled_syllable_text(
-                    commands,
-                    entity,
-                    assets,
-                    settings,
-                    &meta.scale, &key,
-                    &syllable,
-                    size_scale,
-                )
-            }
+            theme.guitar.syllable_text.spawn_scaled_syllable_text(
+                commands,
+                entity,
+                assets,
+                settings,
+                &meta.scale, &key,
+                &syllable,
+                size_scale,
+            )
         }
     }
 }

crates/notation_bevy/src/guitar/guitar_view.rs

@@ -195,7 +195,7 @@ impl GuitarView {
         mut finger_query: Query<(Entity, &mut FretFingerData), With<FretFingerData>>,
         mut barre_query: Query<(Entity, &mut GuitarBarreData), With<GuitarBarreData>>,
         mut dot_query: DotQuery,
-        mut font_query: Query<(&Parent, &mut Text)>,
+        text_query: Query<(&Parent, Entity), With<Text>>,
     ) {
         if Self::CHECKING_FRETS {
             return;
@@ -263,7 +263,7 @@ impl GuitarView {
                         &assets,
                         &theme,
                         &settings,
-                        &mut font_query,
+                        &text_query,
                         finger_entity,
                         &meta.clone().unwrap_or_default(),
                     );
@@ -285,7 +285,7 @@ impl GuitarView {
         mut capo_query: Query<(Entity, &mut GuitarCapoData), With<GuitarCapoData>>,
         mut barre_query: Query<(Entity, &mut GuitarBarreData), With<GuitarBarreData>>,
         mut dot_query: DotQuery,
-        mut font_query: Query<(&Parent, &mut Text)>,
+        text_query: Query<(&Parent, Entity), With<Text>>,
         tab_state_query: Query<(Entity, &TabState), With<TabState>>,
     ) {
         if Self::CHECKING_FRETS {
@@ -330,7 +330,7 @@ impl GuitarView {
                     &assets,
                     &theme,
                     &settings,
-                    &mut font_query,
+                    &text_query,
                     finger_entity,
                     &meta.clone().unwrap_or_default(),
                 );